From ec3d8c079542e8d90661ba6e92fb228baf523e27 Mon Sep 17 00:00:00 2001 From: sdawley Date: Mon, 5 Dec 2022 15:09:36 -0800 Subject: [PATCH 1/3] Add comments so dockerfiles can be updated by update-base-images Signed-off-by: sdawley --- base/ubi8/Dockerfile | 3 ++- universal/ubi8/Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/base/ubi8/Dockerfile b/base/ubi8/Dockerfile index cfbb4b82..128f539a 100644 --- a/base/ubi8/Dockerfile +++ b/base/ubi8/Dockerfile @@ -1,6 +1,7 @@ # syntax=docker/dockerfile:1.3-labs -FROM registry.access.redhat.com/ubi8/ubi +# https://registry.access.redhat.com/ubi8 +FROM registry.access.redhat.com/ubi8/ubi:8.7-1026 LABEL maintainer="Red Hat, Inc." LABEL com.redhat.component="devfile-base-container" diff --git a/universal/ubi8/Dockerfile b/universal/ubi8/Dockerfile index 4a96f49a..50f3048b 100644 --- a/universal/ubi8/Dockerfile +++ b/universal/ubi8/Dockerfile @@ -1,6 +1,7 @@ # syntax=docker/dockerfile:1.3-labs -FROM quay.io/devfile/base-developer-image:ubi8-latest +# https://quay.io/devfile/base-developer-image +FROM quay.io/devfile/base-developer-image:ubi8-13008af LABEL maintainer="Red Hat, Inc." LABEL com.redhat.component="devfile-universal-container" From e3db1162a268e9dd15e2e47f4b4640c1519cd734 Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Tue, 6 Dec 2022 12:12:33 -0400 Subject: [PATCH 2/3] publish a :latest tag too Signed-off-by: Nick Boldt --- .github/workflows/ubi8-build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ubi8-build.yaml b/.github/workflows/ubi8-build.yaml index 8ea33344..2aff56c6 100644 --- a/.github/workflows/ubi8-build.yaml +++ b/.github/workflows/ubi8-build.yaml @@ -40,6 +40,7 @@ jobs: push: ${{ github.event_name != 'pull_request' }} context: base/ubi8 tags: | + quay.io/devfile/base-developer-image:latest ${{ steps.meta.outputs.tags }} build_universal_ubi8_image: From 7b3c8bc518f211c3cf7941635a3bb4f193f71168 Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Tue, 6 Dec 2022 12:12:50 -0400 Subject: [PATCH 3/3] cannot use updateBaseImages.sh on SHA-based tags as they're not date-based or semver-sequential, and therefore cannot be ordered Signed-off-by: Nick Boldt --- universal/ubi8/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/universal/ubi8/Dockerfile b/universal/ubi8/Dockerfile index 50f3048b..d1ef1e21 100644 --- a/universal/ubi8/Dockerfile +++ b/universal/ubi8/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1.3-labs -# https://quay.io/devfile/base-developer-image -FROM quay.io/devfile/base-developer-image:ubi8-13008af +# updateBaseImages.sh can't operate on SHA-based tags as they're not date-based or semver-sequential, and therefore cannot be ordered +FROM quay.io/devfile/base-developer-image:ubi8-latest LABEL maintainer="Red Hat, Inc." LABEL com.redhat.component="devfile-universal-container"