Fix github actions to upload to GHCR (#652)

* Update docker.yml * Update docker.yml * Update docker.yml * Update docker.yml * Update docker.yml * Update docker.yml * Update docker.yml * Update docker.yml * Update containerize-on-tag.yml * Update docker.yml
FreeTAKTeam · Dec 12, 2023 · 8b9c010 · 8b9c010
1 parent e9c2c6b
commit 8b9c010
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/containerize-on-tag.yml b/.github/workflows/containerize-on-tag.yml
@@ -9,6 +9,7 @@ env:
   IMAGE_BASE: freetakteam/freetakserver
   IMAGE_TAG: :${{ github.ref_name }}
   OC_REGISTRY: ghcr.io
+  REGISTRY_URL: "ghcr.io/freetakteam/freetakserver"
 
 jobs:
   lint:
@@ -67,14 +68,16 @@ jobs:
     - uses: actions/checkout@v4
     - name: Build the container image
       # can this be converted to podman at some point to be more foss?
-      run: docker build . --file Dockerfile --tag $OC_REGISTRY/$IMAGE_BASE:$IMAGE_TAG --tag $OC_REGISTRY/$IMAGE_BASE:latest --label "runnumber=${GITHUB_RUN_ID}"
+      run: |
+        SANITIZED_TAG="$(echo ${IMAGE_TAG//[^[:alnum:]]/_} | tr '[:upper:]' '[:lower:]' )"
+        docker build . --file Dockerfile --tag $REGISTRY_URL:$SANITIZED_TAG --tag $REGISTRY_URL:latest --label "runnumber=${GITHUB_RUN_ID}"
 
     - name: Log in to registry
       run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login $OC_REGISTRY -u $ --password-stdin
 
     - name: Push image to registry
       run: |
-        echo IMAGE_BASE=$IMAGE_BASE
-        docker push $OC_REGISTRY/$IMAGE_BASE:$IMAGE_TAG
+        SANITIZED_TAG="$(echo ${IMAGE_TAG//[^[:alnum:]]/_} | tr '[:upper:]' '[:lower:]' )"
+        docker push $OC_REGISTRY/$IMAGE_BASE:$SANITIZED_TAG
         docker push $OC_REGISTRY/$IMAGE_BASE:latest
 
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -5,10 +5,10 @@ on:
   push:
 
 env:
-  IMAGE_BASE: freetakteam/ui
   IMAGE_TAG: ${{ github.ref_name }}
   IMAGE_SHA: ${{ github.sha }}
   OC_REGISTRY: ghcr.io
+  REGISTRY_URL: "ghcr.io/freetakteam/freetakserver"
 
 jobs:
   build_docker_image:
@@ -18,14 +18,16 @@ jobs:
     - uses: actions/checkout@v4
     - name: Build the container image
       # can this be converted to podman at some point to be more foss?
-      run: docker build . --file Dockerfile --tag $OC_REGISTRY/$IMAGE_BASE:$IMAGE_TAG --tag $OC_REGISTRY/$IMAGE_BASE:$IMAGE_SHA --label "runnumber=${GITHUB_RUN_ID}"
+      run: |
+        SANITIZED_TAG="$(echo ${IMAGE_TAG//[^[:alnum:]]/_} | tr '[:upper:]' '[:lower:]' )"
+        docker build . --file Dockerfile --tag $REGISTRY_URL:$SANITIZED_TAG --tag $REGISTRY_URL:$IMAGE_SHA --label "runnumber=${GITHUB_RUN_ID}"
 
     - name: Log in to registry
       run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login $OC_REGISTRY -u $ --password-stdin
 
     - name: Push image to registry
       run: |
-        echo IMAGE_BASE=$IMAGE_BASE
-        docker push $OC_REGISTRY/$IMAGE_BASE:$IMAGE_TAG
-        docker push $OC_REGISTRY/$IMAGE_BASE:$IMAGE_SHA
+        SANITIZED_TAG="$(echo ${IMAGE_TAG//[^[:alnum:]]/_} | tr '[:upper:]' '[:lower:]' )"
+        docker push $REGISTRY_URL:$SANITIZED_TAG
+        docker push $REGISTRY_URL:$IMAGE_SHA