Dockerfile fix

.gitea/workflows/build.yaml

@@ -17,6 +17,8 @@ jobs:
       REPOSITORY: ${{ gitea.repository }}
       #registry.bitdeals.org
       REGISTRY: 10.0.3.111:5000
+      USER: ${{ secrets.DOCKER_USERNAME }}
+      PASS: ${{ secrets.DOCKER_PASSWORD }}
     steps:
       - name: Checkout repository code
         uses: actions/checkout@v6
@@ -25,10 +27,13 @@ jobs:
           docker build . \
             --file "$(find ./Dockerfile ./docker/Dockerfile -print -quit 2>/dev/null)" \
             --label "git-commit=$COMMIT" \
-            --tag "$REGISTRY"/"${REPOSITORY##*/}":"$VERSION"."${COMMIT::7}" \
-            --tag "$REGISTRY"/"${REPOSITORY##*/}":latest
+            --tag "${REGISTRY}/${REPOSITORY##*/}:${VERSION}.${COMMIT::7}" \
+            --tag "${REGISTRY}/${REPOSITORY##*/}:latest"
+      - name: Docker login
+        run: |
+          docker login --username "$USER" --password "$PASS" "$REGISTRY"
       - name: Push images to registry
         run: |
-          docker push "$REGISTRY"/${REPOSITORY##*/}:$VERSION.${COMMIT::7} ; \
-          docker push "$REGISTRY"/${REPOSITORY##*/}:latest
+          docker push "${REGISTRY}/${REPOSITORY##*/}:${VERSION}.${COMMIT::7}" ; \
+          docker push "${REGISTRY}/${REPOSITORY##*/}:latest"
 

docker/Dockerfile

@@ -3,16 +3,15 @@ FROM debian:testing-slim
 SHELL [ "/bin/sh", "-eux", "-c" ]
 
 RUN apt-get update \
-	&& apt-get install -y --no-install-recommends yggdrasil wget ca-certificates unzip libcap2-bin gosu socat;\
+	&& apt-get install -y --no-install-recommends yggdrasil wget ca-certificates libcap2-bin gosu socat jq;\
 	apt-get clean ;\
 	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-RUN PU_VERSION="$(wget --server-response https://github.com/ygguser/peers_updater/releases/latest 2>&1 \
-      | grep -E -m1 'Location: ' \
-      | cut -d'/' -f8)" ;\
-	wget https://github.com/ygguser/peers_updater/releases/download/$PU_VERSION/x86_64-unknown-linux-gnu.zip ;\
-	unzip -d /usr/local/bin/ x86_64-unknown-linux-gnu.zip ;\
-	rm x86_64-unknown-linux-gnu.zip
+RUN PEERS_UPDATER_URL="$(wget -qO- https://api.github.com/repos/ygguser/peers_updater/releases/latest \
+      | jq -r '.assets[] | select(.name == "x86_64-unknown-linux-gnu.zip").browser_download_url') ;\
+      wget -qO- "$PEERS_UPDATER_URL" \
+      | zcat \
+      | install -m 755 /dev/stdin /usr/local/bin/peers_updater ;\
 
 # Set file capability to run as regular user
 RUN setcap cap_net_admin=eip /usr/sbin/yggdrasil