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 f1b70f9fe562f17f69cf4c0ae4733e42e9c59464..9cbff3db81a8d8fb514649e322e25dbec09a0ac3 100644 (file)
--- 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