From 7b1d44c6451e12668774390de7eb0aa802b5a73c Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 19 Dec 2021 11:27:34 +0000 Subject: [PATCH] optimise Dockerfile --- .gitlab-ci.yml | 4 ++-- docker-configs/Dockerfile-proxy | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b9c1a77..12ac072 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,7 @@ build-dev: # This job runs in the build stage, which runs first. script: - echo "Compiling the code..." - cd docker-configs - - docker buildx build --no-cache -f Dockerfile-proxy -t hacknix/freedmr:development-latest -t gitlab.hacknix.net:5050/hacknix/freedmr:development-latest --platform linux/arm/v7,linux/amd64,linux/i386,linux/arm64 --push . + - docker buildx build -f Dockerfile-proxy -t hacknix/freedmr:development-latest -t gitlab.hacknix.net:5050/hacknix/freedmr:development-latest --platform linux/arm/v7,linux/amd64,linux/i386,linux/arm64 --push . @@ -38,7 +38,7 @@ build-release: # This job runs in the build stage, which runs first. script: - echo "Compiling the code..." - cd docker-configs - - docker buildx build --no-cache -f Dockerfile-proxy -t hacknix/freedmr:latest -t gitlab.hacknix.net:5050/hacknix/freedmr:latest -t hacknix/$CI_COMMIT_TAG-with-proxy -t gitlab.hacknix.net:5050/hacknix/freedmr:$CI_COMMIT_TAG-with-proxy -t hacknix/freedmr:development-latest -t gitlab.hacknix.net:5050/hacknix/freedmr:development-latest --platform linux/arm/v7,linux/amd64,linux/i386,linux/arm64 --push . + - docker buildx build -f Dockerfile-proxy -t hacknix/freedmr:latest -t gitlab.hacknix.net:5050/hacknix/freedmr:latest -t hacknix/$CI_COMMIT_TAG-with-proxy -t gitlab.hacknix.net:5050/hacknix/freedmr:$CI_COMMIT_TAG-with-proxy -t hacknix/freedmr:development-latest -t gitlab.hacknix.net:5050/hacknix/freedmr:development-latest --platform linux/arm/v7,linux/amd64,linux/i386,linux/arm64 --push . diff --git a/docker-configs/Dockerfile-proxy b/docker-configs/Dockerfile-proxy index 72f31d1..445dd1e 100644 --- a/docker-configs/Dockerfile-proxy +++ b/docker-configs/Dockerfile-proxy @@ -17,7 +17,7 @@ ############################################################################### FROM python:3.9-alpine -COPY entrypoint-proxy /entrypoint +ENTRYPOINT [ "/entrypoint" ] RUN adduser -D -u 54000 radio && \ apk update && \ @@ -29,6 +29,6 @@ RUN adduser -D -u 54000 radio && \ apk del git gcc musl-dev && \ chown -R radio: /opt/freedmr +COPY entrypoint-proxy /entrypoint USER radio -ENTRYPOINT [ "/entrypoint" ]