diff --git a/.gitea/workflows/release-nightly.yml b/.gitea/workflows/release-nightly.yml index af73307..9d3bb49 100644 --- a/.gitea/workflows/release-nightly.yml +++ b/.gitea/workflows/release-nightly.yml @@ -9,6 +9,7 @@ on: jobs: goreleaser: runs-on: ubuntu-latest + if: false # not implemented on this instance steps: - uses: actions/checkout@v4 with: @@ -35,7 +36,6 @@ jobs: container: image: catthehacker/ubuntu:act-latest env: - DOCKER_ORG: gitea DOCKER_LATEST: nightly steps: - name: Checkout @@ -52,12 +52,14 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v3 with: + registry: ${{ github.server_url }} username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Get Meta id: meta run: | + echo REGISTRY=$(echo ${GITHUB_SERVER_URL} | awk -F[/:] '{print $4}') >> $GITHUB_ENV echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT echo REPO_VERSION=${GITHUB_REF_NAME#v} >> $GITHUB_OUTPUT @@ -72,7 +74,7 @@ jobs: linux/arm64 push: true tags: | - ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }} + ${{ env.REGISTRY }}/${{ github.repository }}:${{ env.DOCKER_LATEST }} - name: Build and push dind uses: docker/build-push-action@v5 @@ -98,4 +100,4 @@ jobs: linux/arm64 push: true tags: | - ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}-dind-rootless + ${{ env.REGISTRY }}/${{ github.repository }}:${{ env.DOCKER_LATEST }}-dind-rootless diff --git a/.gitea/workflows/release-tag.yml b/.gitea/workflows/release-tag.yml index 7735f7e..51fb84a 100644 --- a/.gitea/workflows/release-tag.yml +++ b/.gitea/workflows/release-tag.yml @@ -8,6 +8,7 @@ on: jobs: goreleaser: runs-on: ubuntu-latest + if: false # disabled as goreleaser is not implemented on my instance steps: - uses: actions/checkout@v4 with: @@ -42,7 +43,6 @@ jobs: container: image: catthehacker/ubuntu:act-latest env: - DOCKER_ORG: gitea DOCKER_LATEST: latest steps: - name: Checkout @@ -59,12 +59,14 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v3 with: + registry: ${{ github.server_url }} username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Get Meta id: meta run: | + echo REGISTRY=$(echo ${GITHUB_SERVER_URL} | awk -F[/:] '{print $4}') >> $GITHUB_ENV echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT echo REPO_VERSION=${GITHUB_REF_NAME#v} >> $GITHUB_OUTPUT @@ -79,8 +81,8 @@ jobs: linux/arm64 push: true tags: | - ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }} - ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }} + ${{ env.REGISTRY }}/${{ github.repository }}:${{ steps.meta.outputs.REPO_VERSION }} + ${{ env.REGISTRY }}/${{ github.repository }}:${{ env.DOCKER_LATEST }} - name: Build and push dind uses: docker/build-push-action@v5 @@ -107,5 +109,5 @@ jobs: linux/arm64 push: true tags: | - ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}-dind-rootless - ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}-dind-rootless + ${{ env.REGISTRY }}/${{ github.repository }}:${{ steps.meta.outputs.REPO_VERSION }}-dind-rootless + ${{ env.REGISTRY }}/${{ github.repository }}:${{ env.DOCKER_LATEST }}-dind-rootless diff --git a/internal/app/run/runner.go b/internal/app/run/runner.go index d0246bc..f4289b8 100644 --- a/internal/app/run/runner.go +++ b/internal/app/run/runner.go @@ -157,6 +157,7 @@ func (r *Runner) run(ctx context.Context, task *runnerv1.Task, reporter *report. Token: taskContext["token"].GetStringValue(), RepositoryOwner: taskContext["repository_owner"].GetStringValue(), RetentionDays: taskContext["retention_days"].GetStringValue(), + ServerURL: taskContext["server_url"].GetStringValue(), } if t := task.Secrets["GITEA_TOKEN"]; t != "" { preset.Token = t