Compare commits

...

2 Commits

Author SHA1 Message Date
dabeabb646 Dockerfile fix
All checks were successful
Build docker image and push to registry.bitdeals.org / main-build-job (push) Successful in 23s
2026-03-06 14:47:35 +03:00
2e5e8a90fe fix act_runner build job 2026-03-06 13:17:25 +03:00
2 changed files with 15 additions and 11 deletions

View File

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

View File

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