From 9e467b81f7f6e82fd02f5a2f3b5a7594437aea7b Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Mon, 30 Sep 2024 13:50:59 +0200 Subject: [PATCH 1/2] Remove duplicate raws Signed-off-by: Petr "Stone" Hracek --- .github/workflows/build-and-push.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index 4f0a27f..482f494 100644 --- a/.github/workflows/build-and-push.yml +++ b/.github/workflows/build-and-push.yml @@ -22,14 +22,6 @@ jobs: quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME" quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN" - - dockerfile: "5.40/Dockerfile.c10s" - docker_context: "5.40" - registry_namespace: "sclorg" - tag: "c10s" - image_name: "perl-540-c10s" - quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME" - quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN" - - dockerfile: "5.36/Dockerfile.fedora" docker_context: "5.36" registry_namespace: "fedora" @@ -59,8 +51,9 @@ jobs: registry_namespace: "sclorg" tag: "c10s" image_name: "perl-540-c10s" - quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME" - quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN" + quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME" + quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN" + steps: - name: Build and push to quay.io registry From 82528f99d2a08762afb7505d02f24346c5d03ba1 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Mon, 30 Sep 2024 13:53:00 +0200 Subject: [PATCH 2/2] Perl 5.40 is available in F41 Signed-off-by: Petr "Stone" Hracek --- 5.40/.exclude-fedora | 0 5.40/Dockerfile.fedora | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 5.40/.exclude-fedora diff --git a/5.40/.exclude-fedora b/5.40/.exclude-fedora deleted file mode 100644 index e69de29..0000000 diff --git a/5.40/Dockerfile.fedora b/5.40/Dockerfile.fedora index c4adcd8..153fd67 100644 --- a/5.40/Dockerfile.fedora +++ b/5.40/Dockerfile.fedora @@ -1,4 +1,4 @@ -FROM quay.io/fedora/s2i-base:40 +FROM quay.io/fedora/s2i-base:41 # This image provides a Perl 5.40 environment you can use to run your Perl applications. EXPOSE 8080