Merge pull request #837 from b-ehlers/docker_workflow

Docker build: Simplify definition of DOCKER_REPOSITORY
GNS3 · Oct 26, 2023 · 1667e14 · 1667e14
2 parents f2bb650 + 8b2250b
commit 1667e14
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.github/bin/docker_build b/.github/bin/docker_build
@@ -345,7 +345,7 @@ def needs_rebuild(image, default_repository=None):
     if base_name not in image_info:
         image_info[base_name] = get_time_layers(base_name)
     if not image_info[base_name]:
-        sys.exit(f"Missing base image: {base_name}")
+        sys.exit(f"{image['name']}: Missing base image: {base_name}")
 
     # get information of image, if unknown
     if full_name not in image_info:

diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml
@@ -63,13 +63,11 @@ jobs:
       - name: Build and push images
         env:
           # DOCKER_REPOSITORY - Repository for name-only images
-          # DockerHub:
-          #DOCKER_REPOSITORY: ${{ secrets.DOCKERHUB_REPOSITORY }}
-          # GitHub Container Registry:
-          #DOCKER_REPOSITORY: ghcr.io/${{ github.repository_owner }}
-          # Both DockerHub and GitHub Container Registry:
-          DOCKER_REPOSITORY: >-
+          # Using multiple repositories will build images in all of them.
+          DOCKER_REPOSITORY: |
+            # DockerHub:
             ${{ secrets.DOCKERHUB_REPOSITORY }}
+            # GitHub Container Registry:
             ghcr.io/${{ github.repository_owner }}
           #
           # Variables whose name are starting with "DOCKER_LOGIN"
@@ -90,6 +88,7 @@ jobs:
           #
           IMAGES: ${{ inputs.images }}
         run: |
+          DOCKER_REPOSITORY=$(echo "$DOCKER_REPOSITORY" | sed '/^#/d')
           set -f
           set -- $IMAGES
           set +f