Repair the release

The repo was not properly quoted and the github.ref has another format with direct push.
The push should be done without the tag after the image.

Push resulting image to our DOMjudge GitHub container registry

Alternative is to push to the own doing the PR, but they would be able
to push another image to have the risk that in theory we test another PR
than was used in the code from the PR.

It seems to try to push the latest tag so make which tag pushed
explicit.

Author: Michael Vasseur

.github/workflows/build-contributor-container-PR.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   pr-contributor:
-    if: ${{ github.repository != 'domjudge/domjudge-packaging' || github.ref != 'main' }} 
+    if: ${{ github.repository != 'domjudge/domjudge-packaging' || github.ref != 'refs/heads/main' }} 
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -39,4 +39,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}
+

.github/workflows/build-contributor-container-release.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   release-contributor:
-    if: ${{ github.repository == 'domjudge/domjudge-packaging' && github.ref == 'main' }} 
+    if: ${{ github.repository == 'domjudge/domjudge-packaging' && github.ref == 'refs/heads/main' }} 
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -33,3 +33,4 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: domjudge/domjudge-contributor:latest
+

.github/workflows/build-domjudge-container-PR.yml

@@ -11,7 +11,7 @@ env:
 
 jobs:
   pr-domjudge:
-    if: ${{ github.repository != 'domjudge/domjudge-packaging' || github.ref != 'main' }} 
+    if: ${{ github.repository != 'domjudge/domjudge-packaging' || github.ref != 'refs/heads/main' }} 
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -35,7 +35,7 @@ jobs:
       - name: Get an unique tag for when people PR often
         run: |
           GHR=${{ github.ref }}
-          echo "PR_TAG=${GHR///}" >> $GITHUB_ENV
+          echo "PR_TAG=${GHR///}${{ github.actor }}" >> $GITHUB_ENV
 
       - name: If needed overwrite the DOMJUDGE_VERSION for this run
         run: |
@@ -62,20 +62,20 @@ jobs:
       - name: Build and push
         run: |
           for IMG in domserver judgehost default-judgehost-chroot; do
-            IMAGE_NAME="${{ github.actor }}/$IMG:${{ env.DOMJUDGE_VERSION }}"
-            docker image tag "$IMAGE_NAME" ghcr.io/${{ github.actor }}/$IMG:${{ env.PR_TAG }}
-            docker image tag "$IMAGE_NAME" ${{ github.actor }}/$IMG:${{ env.PR_TAG }}
-            docker push ghcr.io/${{ github.actor }}/$IMG:${{ env.PR_TAG }}
+            IMAGE_NAME="${{ github.repository_owner }}/$IMG:${{ env.DOMJUDGE_VERSION }}"
+            docker image tag "$IMAGE_NAME" ghcr.io/${{ github.repository_owner }}/$IMG:${{ env.PR_TAG }}
+            docker image tag "$IMAGE_NAME" ${{ github.repository_owner }}/$IMG:${{ env.PR_TAG }}
+            docker push ghcr.io/${{ github.repository_owner }}/$IMG:${{ env.PR_TAG }}
           done
 
       - name: Check for wrong permisions
         run: |
           docker image list
           set -x
           for IMG in domserver judgehost; do
-            files=$(docker run --rm --pull=never "${{ github.actor }}/$IMG:${{ env.PR_TAG }}" find / -xdev -perm -o+w ! -type l ! \( -type d -a -perm -+t \) ! -type c)
+            files=$(docker run --rm --pull=never "${{ github.repository_owner }}/$IMG:${{ env.PR_TAG }}" find / -xdev -perm -o+w ! -type l ! \( -type d -a -perm -+t \) ! -type c)
             if [ -n "$files" ]; then
-              echo "error: image ${{ github.actor }}/$IMG:${{ env.PR_TAG }} contains world-writable files:" >&2
+              echo "error: image ${{ github.repository_owner }}/$IMG:${{ env.PR_TAG }} contains world-writable files:" >&2
               printf "%s\n" "$files" >&2
               exit 1
             fi

.github/workflows/build-domjudge-container-release.yml

@@ -12,7 +12,7 @@ env:
 
 jobs:
   release-domjudge:
-    if: ${{ github.repository == 'domjudge/domjudge-packaging' && github.ref == 'main' }} 
+    if: ${{ github.repository == 'domjudge/domjudge-packaging' && github.ref == 'refs/heads/main' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -60,6 +60,7 @@ jobs:
             docker push domjudge/$IMG:${{ env.DOMJUDGE_VERSION }}
             if [ ${{ env.DOMJUDGE_LATEST }} = "true" ]; then
               docker tag domjudge/$IMG:${{ env.DOMJUDGE_VERSION }} domjudge/$IMG:latest
-              docker push domjudge/$IMG:latest
+              docker push domjudge/$IMG
             fi
           done
+

.github/workflows/build-gitlab-container-PR.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   pr-gitlab:
-    if: ${{ github.repository != 'domjudge/domjudge-packaging' || github.ref != 'main' }} 
+    if: ${{ github.repository != 'domjudge/domjudge-packaging' || github.ref != 'refs/heads/main' }} 
     name: PR GitLab image
     runs-on: ubuntu-latest
     permissions:
@@ -40,3 +40,4 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+

.github/workflows/build-gitlab-container-release.yml

@@ -4,9 +4,10 @@ on:
   push:
     branches:
       - main
+
 jobs:
   build-gitlab:
-    if: ${{ github.repository == domjudge/domjudge-packaging && github.ref == main }} 
+    if: ${{ github.repository == 'domjudge/domjudge-packaging' && github.ref == 'refs/heads/main' }} 
     name: Build GitLab image
     runs-on: ubuntu-latest
     permissions:
@@ -38,3 +39,4 @@ jobs:
           push: true
           tags: "domjudge/gitlabci:22.04"
           labels: ${{ steps.meta.outputs.labels }}
+