From 816cf152724cd37b29fc610bc98fdc6a21aa5d10 Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 19 Sep 2022 13:56:39 +0100 Subject: [PATCH] Revert "Get ready for merge to master" This reverts commit a371ca4db07ff0d1e6a528e34caab229935b7a2b. --- .gitlab-ci.yml | 15 +++++++++++++++ docker-configs/Dockerfile-proxy | 1 + 2 files changed, 16 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 75e7820..d8046ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,6 +31,21 @@ build-dev: # This job runs in the build stage, which runs first. only: - master +build-extrastats: # This job runs in the build stage, which runs first. + stage: build + tags: + - buildx + script: + - echo "Compiling the code..." + - cd docker-configs + - docker buildx build --no-cache -f Dockerfile-proxy -t hacknix/freedmr:extrastats-development-latest -t gitlab.hacknix.net:5050/hacknix/freedmr:extrastats-development-latest --platform linux/amd64 --push . + + + + - echo "Compile complete." + only: + - extrastats + build-testing: # This job runs in the build stage, which runs first. stage: build tags: diff --git a/docker-configs/Dockerfile-proxy b/docker-configs/Dockerfile-proxy index 898029a..30ecca2 100644 --- a/docker-configs/Dockerfile-proxy +++ b/docker-configs/Dockerfile-proxy @@ -25,6 +25,7 @@ RUN adduser -D -u 54000 radio && \ cd /opt && \ git clone https://gitlab.hacknix.net/hacknix/FreeDMR.git freedmr && \ cd /opt/freedmr && \ + git checkout extrastats && \ pip install --no-cache-dir -r requirements.txt && \ apk del git gcc musl-dev && \ chown -R radio: /opt/freedmr