diff --git a/.github/workflows/apkbuild.yml b/.github/workflows/apkbuild.yml index cf6e2c73c1..c17ff25a9f 100644 --- a/.github/workflows/apkbuild.yml +++ b/.github/workflows/apkbuild.yml @@ -31,7 +31,7 @@ jobs: BUILDER: apkbuild MATRIX_TAG: ${{matrix.alpine}} run: | - DOCKER_IMAGE=${{ github.repository }}-${BUILDER} + DOCKER_IMAGE=ghcr.io/${{ github.repository }}-${BUILDER} TAGS="${DOCKER_IMAGE}:${MATRIX_TAG},${DOCKER_IMAGE}:latest" COMMIT_SHA="${GITHUB_SHA}" if [[ $GITHUB_REF == refs/tags/* ]]; then @@ -50,8 +50,9 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} + registry: ghcr.io + username: "${{ github.actor }}" + password: "${{ secrets.GITHUB_TOKEN }}" - name: "Build and push APK builder docker image to DockerHub" id: docker_build_builder uses: docker/build-push-action@v5 diff --git a/.github/workflows/debbuild.yml b/.github/workflows/debbuild.yml index e09d3ec7d5..6b1e8ed0f8 100644 --- a/.github/workflows/debbuild.yml +++ b/.github/workflows/debbuild.yml @@ -32,7 +32,7 @@ jobs: BUILDER: debbuild MATRIX_TAG: ${{matrix.debian}} run: | - DOCKER_IMAGE=${{ github.repository }}-${BUILDER} + DOCKER_IMAGE=ghcr.io/${{ github.repository }}-${BUILDER} TAGS="${DOCKER_IMAGE}:${MATRIX_TAG},${DOCKER_IMAGE}:latest" COMMIT_SHA="${GITHUB_SHA}" if [[ $GITHUB_REF == refs/tags/* ]]; then @@ -53,8 +53,9 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} + registry: ghcr.io + username: "${{ github.actor }}" + password: "${{ secrets.GITHUB_TOKEN }}" - name: "Build and push Debian builder docker image to DockerHub" id: docker_build_builder uses: docker/build-push-action@v5 diff --git a/.github/workflows/rpmbuild.yml b/.github/workflows/rpmbuild.yml index 50566922e2..a17787ac4a 100644 --- a/.github/workflows/rpmbuild.yml +++ b/.github/workflows/rpmbuild.yml @@ -32,7 +32,7 @@ jobs: BUILDER: rpmbuild MATRIX_TAG: ${{matrix.centos}} run: | - DOCKER_IMAGE=${{ github.repository }}-${BUILDER} + DOCKER_IMAGE=ghcr.io/${{ github.repository }}-${BUILDER} TAGS="${DOCKER_IMAGE}:${MATRIX_TAG},${DOCKER_IMAGE}:latest" COMMIT_SHA="${GITHUB_SHA}" if [[ $GITHUB_REF == refs/tags/* ]]; then @@ -53,8 +53,9 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} + registry: ghcr.io + username: "${{ github.actor }}" + password: "${{ secrets.GITHUB_TOKEN }}" - name: "Build and push RPM builder docker image to DockerHub" id: docker_build_builder uses: docker/build-push-action@v5