From 95d32c15bac86333c0152ed458b2a28392e36e51 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Fri, 22 Apr 2022 13:31:18 +0200 Subject: [PATCH 1/4] Add the latest container-common-scripts Signed-off-by: Petr "Stone" Hracek --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index 789ca3e7..fcc0742b 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 789ca3e7e4b5625b87d1c71672b26407f040950d +Subproject commit fcc0742b13ba0496f484e50a47f8945d86e37a5a From 5600fa000c7098c85f470501531a0e06411023da Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Fri, 22 Apr 2022 13:31:36 +0200 Subject: [PATCH 2/4] Use s2i-core from quay.io Signed-off-by: Petr "Stone" Hracek --- src/Dockerfile.fedora | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Dockerfile.fedora b/src/Dockerfile.fedora index a53ae6aa..577e775a 100644 --- a/src/Dockerfile.fedora +++ b/src/Dockerfile.fedora @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/{{ spec.latest_fedora }}/s2i-core:latest +FROM quay.io/fedora/s2i-core:35 # PostgreSQL image for OpenShift. # Volumes: @@ -33,9 +33,9 @@ LABEL summary="$SUMMARY" \ io.openshift.tags="database,postgresql,postgresql{{ spec.short }}" \ com.redhat.component="$NAME" \ maintainer="SoftwareCollections.org " \ - name="$FGC/$NAME" \ + name="fedora/$NAME-{{ spec.short }}" \ version="0" \ - usage="docker run -d --name postgresql_database -e POSTGRESQL_USER=user -e POSTGRESQL_PASSWORD=pass -e POSTGRESQL_DATABASE=db -p 5432:5432 $FGC/$NAME" + usage="docker run -d --name postgresql_database -e POSTGRESQL_USER=user -e POSTGRESQL_PASSWORD=pass -e POSTGRESQL_DATABASE=db -p 5432:5432 quay.io/fedora/$NAME-{{ spec.short }}" EXPOSE 5432 From 3a3c34460f022e8b4b192f1c036e417b08d78456 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Fri, 22 Apr 2022 13:45:55 +0200 Subject: [PATCH 3/4] Build and push update for versions - 11, 12, 13 Signed-off-by: Petr "Stone" Hracek --- .github/workflows/build-and-push.yml | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index 8bfa57cc..2cd0d040 100644 --- a/.github/workflows/build-and-push.yml +++ b/.github/workflows/build-and-push.yml @@ -18,30 +18,52 @@ jobs: dockerfile: "Dockerfile" registry_namespace: "centos7" tag: "centos7" + suffix: "centos7" quayio_username: "QUAY_IMAGE_BUILDER_USERNAME" quayio_token: "QUAY_IMAGE_BUILDER_TOKEN" - dockerfile_path: "12" dockerfile: "Dockerfile" registry_namespace: "centos7" tag: "centos7" + suffix: "centos7" quayio_username: "QUAY_IMAGE_BUILDER_USERNAME" quayio_token: "QUAY_IMAGE_BUILDER_TOKEN" - dockerfile_path: "13" dockerfile: "Dockerfile" registry_namespace: "centos7" tag: "centos7" + suffix: "centos7" quayio_username: "QUAY_IMAGE_BUILDER_USERNAME" quayio_token: "QUAY_IMAGE_BUILDER_TOKEN" - dockerfile_path: "13" dockerfile: "Dockerfile.c9s" registry_namespace: "sclorg" tag: "c9s" + suffix: "c8s" quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME" quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN" + - dockerfile_path: "11" + dockerfile: "Dockerfile.fedora" + registry_namespace: "fedora" + tag: "11" + quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME" + quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN" + - dockerfile_path: "12" + dockerfile: "Dockerfile.fedora" + registry_namespace: "fedora" + tag: "12" + quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME" + quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN" + - dockerfile_path: "13" + dockerfile: "Dockerfile.fedora" + registry_namespace: "fedora" + tag: "13" + quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME" + quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN" steps: - name: Build and push to quay.io registry - uses: sclorg/build-and-push-action@v1 + uses: sclorg/build-and-push-action@v2 with: registry: "quay.io" registry_namespace: ${{ matrix.registry_namespace }} @@ -52,3 +74,4 @@ jobs: dockerfile_path: ${{ matrix.dockerfile_path }} tag: ${{ matrix.tag }} use_distgen: "true" + suffix: ${{ matrix.suffix }} From fc8fd2a6033fb53d0830afbfad777e95d1209f11 Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Tue, 26 Apr 2022 10:15:20 +0200 Subject: [PATCH 4/4] Update .github/workflows/build-and-push.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Zuzana Miklánková --- .github/workflows/build-and-push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index 2cd0d040..9a49f5f5 100644 --- a/.github/workflows/build-and-push.yml +++ b/.github/workflows/build-and-push.yml @@ -39,7 +39,7 @@ jobs: dockerfile: "Dockerfile.c9s" registry_namespace: "sclorg" tag: "c9s" - suffix: "c8s" + suffix: "c9s" quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME" quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN" - dockerfile_path: "11"