alemaire/buildx
1
0
Fork 0
mirror of https://gitlab.com/alemaire/buildx.git synced 2025-01-10 18:43:29 +00:00
Code Issues Projects Releases Wiki Activity

Update .gitlab-ci.yml, minio/Makefile, keycloak/Makefile, unifi/Makefile, watchdog/Makefile, minio/Dockerfile, unifi/Dockerfile, watchdog/Dockerfile, keycloak/Dockerfile files

Browse Source
This commit is contained in:
Adrien le Maire 2020-12-11 15:27:46 +00:00
parent 92a6e087e2
commit 2019e1e96e
9 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.yml
View File

@ -107,6 +107,7 @@ keycloak:
if [ "${CI_COMMIT_REF_PROTECTED}" == "true" ]; then
echo "Log on Docker Hub"
echo "${DOCKER_HUB_KEY}" | docker login -u "alemairebe" --password-stdin
docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
fi
mkdir -p /root/.docker/cli-plugins

2
keycloak/Dockerfile
View File

@ -1,4 +1,4 @@
FROM debian:buster-20200908-slim
FROM debian:buster-20201209-slim
ADD https://curl.haxx.se/ca/cacert.pem /etc/ssl/certs/cacert.pem
ENV CURL_CA_BUNDLE=/etc/ssl/certs/cacert.pem

6
keycloak/Makefile
View File

@ -6,12 +6,14 @@ IMAGE=keycloak
nopush:
docker buildx build --platform linux/amd64 --load \
--build-arg VERSION=$(VERSION) \
--tag ${NAMESPACE}/${IMAGE}:$(VERSION) .
--tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .
push:
docker buildx build --platform linux/amd64,linux/arm64,linux/arm --push \
--build-arg VERSION=$(VERSION) \
--cache-from=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
--cache-to=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
--tag ${NAMESPACE}/${IMAGE}:$(VERSION) .
--tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .

2
minio/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.12
FROM alpine:3.12.2
ENV MINIO_ACCESS_KEY_FILE=access_key \
MINIO_SECRET_KEY_FILE=secret_key \

9
minio/Makefile
View File

@ -6,13 +6,14 @@ IMAGE=minio
nopush:
docker buildx build --platform linux/amd64 --load \
--build-arg VERSION=$(VERSION) \
--tag ${NAMESPACE}/${IMAGE}:$(VERSION) .
--tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .
push:
docker buildx build --platform linux/amd64,linux/arm64,linux/arm,linux/ppc64le --push \
--build-arg VERSION=$(VERSION) \
--cache-from=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
--cache-from=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
--cache-to=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
--tag ${NAMESPACE}/${IMAGE}:$(VERSION) .
--tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .

2
unifi/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:focal-20200916
FROM ubuntu:focal-20201106
ARG DEBIAN_FRONTEND=noninteractive

6
unifi/Makefile
View File

@ -7,7 +7,8 @@ nopush:
docker buildx build --platform linux/amd64 --load \
--build-arg VERSION=$(VERSION) \
--build-arg UNIFI_VERSION=$(UNIFI_VERSION) \
--tag ${NAMESPACE}/${IMAGE}:$(VERSION) .
--tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .
push:
docker buildx build --platform linux/amd64,linux/arm64 --push \
@ -15,4 +16,5 @@ push:
--build-arg UNIFI_VERSION=$(UNIFI_VERSION) \
--cache-from=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
--cache-to=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
--tag ${NAMESPACE}/${IMAGE}:$(VERSION) .
--tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .

2
watchdog/Dockerfile
View File

@ -1,4 +1,4 @@
FROM debian:buster-20200908-slim
FROM debian:buster-20201209-slim
ARG DEBIAN_FRONTEND=noninteractive
ARG VERSION
RUN apt update -qq && \

9
watchdog/Makefile
View File

@ -6,13 +6,14 @@ IMAGE=watchdog
nopush:
docker buildx build --platform linux/amd64 --load \
--build-arg VERSION=$(VERSION) \
--tag ${NAMESPACE}/${IMAGE}:$(VERSION) .
--tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .
push:
docker buildx build --platform linux/amd64,linux/arm64,linux/arm,linux/ppc64le --push \
--build-arg VERSION=$(VERSION) \
--cache-from=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
--cache-from=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
--cache-to=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
--tag ${NAMESPACE}/${IMAGE}:$(VERSION) .
--tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .