From: Matthew Newton <matthew-git@newtoncomputing.co.uk>
Date: Thu, 4 May 2023 12:57:56 +0000 (+0100)
Subject: CI: add label to local Docker images, too
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3dcbe11b8135253c2f2b94846dc67bec0dd6b20;p=thirdparty%2Ffreeradius-server.git

CI: add label to local Docker images, too

so we know to not tidy them up
---

diff --git a/.github/workflows/docker-refresh.yml b/.github/workflows/docker-refresh.yml
index f1b70f9fe56..9cbff3db81a 100644
--- a/.github/workflows/docker-refresh.yml
+++ b/.github/workflows/docker-refresh.yml
@@ -26,14 +26,14 @@ jobs:
         with:
           lfs: false
 
-      - name: Fetch images
+      - name: Fetch and label images
         shell: bash
         run: |
           docker pull "$DOCKER_BASE_IMAGE"
-          docker tag "$DOCKER_BASE_IMAGE" "$DOCKER_REGISTRY/$DOCKER_BASE_IMAGE"
+          echo "FROM $DOCKER_BASE_IMAGE" | docker build --label preserve=true -t "$DOCKER_REGISTRY/$DOCKER_BASE_IMAGE" -
           for IMAGE in $DOCKER_EXTRA_IMAGES; do \
             docker pull "$IMAGE"; \
-            docker tag "$IMAGE" "$DOCKER_REGISTRY/$IMAGE"; \
+            echo "FROM $IMAGE" | docker build --label preserve=true -t "$DOCKER_REGISTRY/$IMAGE" -; \
           done
 
       - name: Create build dependency package
@@ -53,10 +53,10 @@ jobs:
             mv freeradius-build-deps_1*.deb freeradius-build-deps-extra.deb
             chown $(stat -c'%u:%g' .git) *
 
-      - name: Build Docker image
+      - name: Build main Docker image
         shell: bash
         run: |
-          docker build --no-cache -f scripts/ci/Dockerfile -t "$DOCKER_IMAGE_NAME" .
+          docker build --no-cache -f scripts/ci/Dockerfile -t "$DOCKER_IMAGE_NAME" --label preserve=true .
 
       - name: Docker login
         uses: docker/login-action@v2