From 23d05649e704c51acae5b4351ef5e76b887ab55d Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 14 Dec 2022 11:26:05 +0000 Subject: [PATCH] More work on CI build --- .gitlab-ci.yml | 4 ++-- docker-configs/Dockerfile-ci | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c7c6528..e34977f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,10 +22,10 @@ build-dev: # This job runs in the build stage, which runs first. - buildx script: - echo "Compiling the code..." - - cd docker-configs + #- 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 --no-cache -f Dockerfile-ci -t hacknix/freedmr:development-latest -t gitlab.hacknix.net:5050/hacknix/freedmr:development-latest --platform linux/amd64 --push . + - docker buildx build --no-cache -f docker-configs/Dockerfile-ci -t hacknix/freedmr:development-latest -t gitlab.hacknix.net:5050/hacknix/freedmr:development-latest --platform linux/amd64 --push . - echo "Compile complete." diff --git a/docker-configs/Dockerfile-ci b/docker-configs/Dockerfile-ci index 71e2620..6e7320b 100644 --- a/docker-configs/Dockerfile-ci +++ b/docker-configs/Dockerfile-ci @@ -19,7 +19,7 @@ FROM python:3.10-alpine ENTRYPOINT [ "/entrypoint" ] -COPY ../ /opt/freedmr +COPY . /opt/freedmr RUN adduser -D -u 54000 radio && \ apk update && \ @@ -31,6 +31,6 @@ RUN adduser -D -u 54000 radio && \ apk del git gcc musl-dev && \ chown -R radio: /opt/freedmr -COPY entrypoint-proxy /entrypoint +COPY docker-configs/entrypoint-proxy /entrypoint USER radio