From c938c4df5af32467180378ff5dd6f1137838dbb6 Mon Sep 17 00:00:00 2001 From: anthorob Date: Wed, 18 Mar 2026 09:03:13 -0400 Subject: [PATCH] fix workflow --- .gitea/workflows/build-java.yml | 6 ++---- .gitea/workflows/build-php.yml | 6 ++---- .gitea/workflows/build-python.yml | 6 ++---- java/Dockerfile.java21 | 2 +- php/Dockerfile.php82 | 2 +- php/Dockerfile.php84 | 2 +- python/Dockerfile.python3 | 2 +- 7 files changed, 10 insertions(+), 16 deletions(-) diff --git a/.gitea/workflows/build-java.yml b/.gitea/workflows/build-java.yml index b0a5873..a872055 100644 --- a/.gitea/workflows/build-java.yml +++ b/.gitea/workflows/build-java.yml @@ -4,8 +4,6 @@ on: push: branches: - main - schedule: - - cron: "@weekly" workflow_dispatch: jobs: @@ -20,7 +18,7 @@ jobs: - name: Login to Registry uses: docker/login-action@v3 with: - registry: ${{ secrets.REGISTRY_URL }} + registry: ${{ vars.REGISTRY_URL }} username: ${{ secrets.REGISTRY_USER }} password: ${{ secrets.REGISTRY_PASSWORD }} @@ -30,4 +28,4 @@ jobs: context: . file: java/Dockerfile.java${{ matrix.java_version }} push: true - tags: ${{ vars.CI_REGISTRY_IMAGE }}:java${{ matrix.java_version }} \ No newline at end of file + tags: ${{ vars.REGISTRY_URL }}/${{ secrets.REGISTRY_USER }}/coder-images:java${{ matrix.java_version }} \ No newline at end of file diff --git a/.gitea/workflows/build-php.yml b/.gitea/workflows/build-php.yml index 380e826..c1c0af8 100644 --- a/.gitea/workflows/build-php.yml +++ b/.gitea/workflows/build-php.yml @@ -4,8 +4,6 @@ on: push: branches: - main - schedule: - - cron: "@weekly" workflow_dispatch: jobs: @@ -20,7 +18,7 @@ jobs: - name: Login to Registry uses: docker/login-action@v3 with: - registry: ${{ secrets.REGISTRY_URL }} + registry: ${{ vars.REGISTRY_URL }} username: ${{ secrets.REGISTRY_USER }} password: ${{ secrets.REGISTRY_PASSWORD }} @@ -30,4 +28,4 @@ jobs: context: . file: php/Dockerfile.php${{ matrix.php_version }} push: true - tags: ${{ vars.CI_REGISTRY_IMAGE }}:php${{ matrix.php_version }} \ No newline at end of file + tags: ${{ vars.REGISTRY_URL }}/${{ secrets.REGISTRY_USER }}/coder-images:php${{ matrix.php_version }} \ No newline at end of file diff --git a/.gitea/workflows/build-python.yml b/.gitea/workflows/build-python.yml index c730c6d..ceb8e2b 100644 --- a/.gitea/workflows/build-python.yml +++ b/.gitea/workflows/build-python.yml @@ -4,8 +4,6 @@ on: push: branches: - main - schedule: - - cron: "@weekly" workflow_dispatch: jobs: @@ -17,7 +15,7 @@ jobs: - name: Login to Registry uses: docker/login-action@v3 with: - registry: ${{ secrets.REGISTRY_URL }} + registry: ${{ vars.REGISTRY_URL }} username: ${{ secrets.REGISTRY_USER }} password: ${{ secrets.REGISTRY_PASSWORD }} @@ -27,4 +25,4 @@ jobs: context: . file: python/Dockerfile.python3 push: true - tags: ${{ vars.CI_REGISTRY_IMAGE }}:python3 + tags: ${{ vars.REGISTRY_URL }}/${{ secrets.REGISTRY_USER }}/coder-images:python3 diff --git a/java/Dockerfile.java21 b/java/Dockerfile.java21 index 8a4c4b3..94252ef 100644 --- a/java/Dockerfile.java21 +++ b/java/Dockerfile.java21 @@ -1,4 +1,4 @@ -FROM registry.bobert.me/anthorob/coder-base:latest@sha256:ff48bd8e316d473090f664a69514bc1efc1badfed81e293f97fcb610be8530b3 +FROM gitea.bobert.me/anthorob/coder-base:latest@sha256:ff48bd8e316d473090f664a69514bc1efc1badfed81e293f97fcb610be8530b3 USER root diff --git a/php/Dockerfile.php82 b/php/Dockerfile.php82 index a3c3dfa..e2fcf86 100644 --- a/php/Dockerfile.php82 +++ b/php/Dockerfile.php82 @@ -1,4 +1,4 @@ -FROM registry.bobert.me/anthorob/coder-base:latest@sha256:ff48bd8e316d473090f664a69514bc1efc1badfed81e293f97fcb610be8530b3 +FROM gitea.bobert.me/anthorob/coder-base:latest@sha256:ff48bd8e316d473090f664a69514bc1efc1badfed81e293f97fcb610be8530b3 USER root diff --git a/php/Dockerfile.php84 b/php/Dockerfile.php84 index a09ea60..53e8260 100644 --- a/php/Dockerfile.php84 +++ b/php/Dockerfile.php84 @@ -1,4 +1,4 @@ -FROM registry.bobert.me/anthorob/coder-base:latest@sha256:ff48bd8e316d473090f664a69514bc1efc1badfed81e293f97fcb610be8530b3 +FROM gitea.bobert.me/anthorob/coder-base:latest@sha256:ff48bd8e316d473090f664a69514bc1efc1badfed81e293f97fcb610be8530b3 USER root diff --git a/python/Dockerfile.python3 b/python/Dockerfile.python3 index 20a0f6f..fe11d11 100644 --- a/python/Dockerfile.python3 +++ b/python/Dockerfile.python3 @@ -1,4 +1,4 @@ -FROM registry.bobert.me/anthorob/coder-base:latest@sha256:ff48bd8e316d473090f664a69514bc1efc1badfed81e293f97fcb610be8530b3 +FROM gitea.bobert.me/anthorob/coder-base:latest@sha256:ff48bd8e316d473090f664a69514bc1efc1badfed81e293f97fcb610be8530b3 USER root