From a371ca4db07ff0d1e6a528e34caab229935b7a2b Mon Sep 17 00:00:00 2001
From: Simon <simon@gb7fr.org.uk>
Date: Mon, 19 Sep 2022 12:51:18 +0100
Subject: [PATCH] Get ready for merge to master

---
 .gitlab-ci.yml                  | 15 ---------------
 docker-configs/Dockerfile-proxy |  1 -
 2 files changed, 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d8046ba..75e7820 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,21 +31,6 @@ 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 30ecca2..898029a 100644
--- a/docker-configs/Dockerfile-proxy
+++ b/docker-configs/Dockerfile-proxy
@@ -25,7 +25,6 @@ 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