From 42cb1aad7f41327057e14525103529f41d168a2e Mon Sep 17 00:00:00 2001 From: melody Date: Sun, 27 Jul 2025 23:01:12 +0200 Subject: [PATCH 1/3] add true-edge --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e56e437..5c5d2b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,4 @@ FROM scratch ADD $FILENAME / -CMD ["/bin/sh"] \ No newline at end of file +RUN apk upgrade --no-cache +CMD ["/bin/sh"] From 6be7a50e05331c45cadcfa97ccf69c6848dafdef Mon Sep 17 00:00:00 2001 From: melody Date: Sun, 27 Jul 2025 23:05:39 +0200 Subject: [PATCH 2/3] fix docker tag --- .forgejo/workflows/build.yml | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 569a4e1..b0753dc 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -38,25 +38,8 @@ jobs: echo "NEWEST_VERSION=$NEWEST_VERSION" >> $GITHUB_ENV echo "FILENAME=$FILENAME" >> $GITHUB_ENV - - name: Determine if update is needed - run: | - last_version_file=".last_version" - last_dockerfile_hash_file=".dockerfile_hash" - - last_version=$(cat $last_version_file 2>/dev/null || echo "none") - last_dockerfile_hash=$(cat $last_dockerfile_hash_file 2>/dev/null || echo "none") - dockerfile_hash=$(sha256sum Dockerfile | awk '{print $1}' || echo "nuh") - - update="false" - if [ ${{ github.event_name }} == "workflow_dispatch" ] || [ "$last_version" != "$NEWEST_VERSION" ] || [ "$last_dockerfile_hash" != "$dockerfile_hash" ]; then - update="true" - fi - - echo "UPDATE=$update" >> $GITHUB_ENV - echo "DOCKERFILE_HASH=$dockerfile_hash" >> $GITHUB_ENV - name: Start Docker daemon - if: env.UPDATE == 'true' run: | dockerd-entrypoint.sh & for i in {1..10}; do @@ -67,7 +50,6 @@ jobs: docker info || { echo "Docker daemon failed to start."; exit 1; } - name: Get and verify Buildfiles - if: env.UPDATE == 'true' run: | curl -LOs "$REPO_URL/$FILENAME" curl -LOs "$REPO_URL/$FILENAME.sha512" @@ -77,19 +59,7 @@ jobs: - name: Build and push Docker image - if: env.UPDATE == 'true' run: | - docker build --build-arg NPROC=1 -t $DOCKER_REGISTRY/$REGISTRY_USER/$PACKAGE:latest -t $DOCKER_REGISTRY/$REGISTRY_USER/$PACKAGE:$NEWEST_VERSION . + docker build --build-arg NPROC=1 -t $DOCKER_REGISTRY/$REGISTRY_USER/$PACKAGE:true-edge echo "${{ secrets.DOCKER_PASSWORD }}" | docker login $DOCKER_REGISTRY -u $REGISTRY_USER --password-stdin docker push --all-tags $DOCKER_REGISTRY/$REGISTRY_USER/$PACKAGE - echo "$NEWEST_VERSION" > .last_version - echo "$DOCKERFILE_HASH" > .dockerfile_hash - - - name: Commit updated metadata - if: env.UPDATE == 'true' - run: | - git config user.name "$COMMIT_AUTHOR_NAME" - git config user.email "$COMMIT_AUTHOR_EMAIL" - git add .last_version .dockerfile_hash - git commit -m "$COMMIT_MESSAGE" || echo "No commit" - git push \ No newline at end of file From bbd71feb9740d531af886c65152345c65ee66531 Mon Sep 17 00:00:00 2001 From: melody Date: Sun, 27 Jul 2025 23:08:03 +0200 Subject: [PATCH 3/3] fix docker build command --- .forgejo/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index b0753dc..bc4e2af 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -60,6 +60,6 @@ jobs: - name: Build and push Docker image run: | - docker build --build-arg NPROC=1 -t $DOCKER_REGISTRY/$REGISTRY_USER/$PACKAGE:true-edge + docker build --build-arg NPROC=1 -t $DOCKER_REGISTRY/$REGISTRY_USER/$PACKAGE:true-edge . echo "${{ secrets.DOCKER_PASSWORD }}" | docker login $DOCKER_REGISTRY -u $REGISTRY_USER --password-stdin docker push --all-tags $DOCKER_REGISTRY/$REGISTRY_USER/$PACKAGE