From b4ae59b417151e911cc431b92e27166fa07ac02a Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Sun, 8 Mar 2020 09:22:39 +0100 Subject: [PATCH 1/9] Update from upstream and switch to f32. --- Dockerfile | 4 ++-- README.md | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index be89a8e..c92b668 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # This image is the base image for all OpenShift v3 language container images. -FROM registry.fedoraproject.org/f30/s2i-core:latest +FROM registry.fedoraproject.org/f32/s2i-core:latest ENV SUMMARY="Base image with essential libraries and tools used as a base for \ builder images like perl, python, ruby, etc." \ @@ -30,6 +30,7 @@ RUN INSTALL_PKGS="autoconf \ gdb \ git \ libcurl-devel \ + libpq-devel \ libxml2-devel \ libxslt-devel \ lsof \ @@ -38,7 +39,6 @@ RUN INSTALL_PKGS="autoconf \ npm \ openssl-devel \ patch \ - postgresql-devel \ procps-ng \ sqlite-devel \ unzip \ diff --git a/README.md b/README.md index 13e4efe..7b4156a 100644 --- a/README.md +++ b/README.md @@ -47,22 +47,23 @@ Two examples: * If you specify `BASH_ENV`, then all your `#!/bin/bash` scripts do not need to call `scl enable`. * If you specify `PROMPT_COMMAND`, then on execution of the -`docker exec ... /bin/bash` command, the collection will be automatically enabled. +`podman exec ... /bin/bash` command, the collection will be automatically enabled. *Note*: Executables in Software Collections packages (e.g., `ruby`) are not directly in a directory named in the `PATH` environment variable. This means that you cannot do: - $ docker exec ... ruby + $ podman exec ... ruby but must instead do: - $ docker exec ... /bin/bash -c ruby + $ podman exec ... /bin/bash -c ruby The `/bin/bash -c`, along with the setting the appropriate environment variable, ensures the correct `ruby` executable is found and invoked. +Note: while the examples in this README are calling `podman`, you can replace any such calls by `docker` with the same arguments Usage ------------------------ @@ -82,7 +83,7 @@ $ make build VERSIONS=base TARGET=rhel7 This image is available on DockerHub. To download it run: ```console -docker pull sclorg/s2i-base-centos7 +podman pull sclorg/s2i-base-centos7 ``` To build a Base image from scratch run: @@ -101,4 +102,5 @@ See also -------- Dockerfile and other sources are available on https://github.com/sclorg/s2i-base-container. In that repository you also can find another variants of S2I base Dockerfiles. -Dockerfile for CentOS is called Dockerfile, Dockerfile for RHEL is called Dockerfile.rhel7. +The Dockerfile for CentOS is called Dockerfile, the Dockerfile for RHEL7 is called Dockerfile.rhel7, +the Dockerfile for RHEL8 is called Dockerfile.rhel8 and the Dockerfile for Fedora is Dockerfile.fedora. From 4fded5c74d98c251160fc380669fe79db7adc14d Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Wed, 22 Apr 2020 09:31:23 +0200 Subject: [PATCH 2/9] This commit adds support for syncing upstream repository to Fedora land Signed-off-by: Petr "Stone" Hracek --- bot-cfg.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 bot-cfg.yml diff --git a/bot-cfg.yml b/bot-cfg.yml new file mode 100644 index 0000000..1219746 --- /dev/null +++ b/bot-cfg.yml @@ -0,0 +1,27 @@ + version: "1" + +betka: + # is betka enabled for this repository + # optional - defaults to false + enabled: true + + # optional + notifications: + email_addresses: [phracek@redhat.com] + + # Specify if master branch in upstream repository is synced + master_checker: true + # Should pull requests be synced? + # optional + pr_checker: false + # Either 'upstream_branch_name' or 'upstream_git_path' has to be specified + # Branch name which is used for sync + upstream_branch_name: master + # Path to directory with dockerfile withing upstream repository + upstream_git_path: "base" + # Github comment message to enforce sync of a pull request + # required if pr_checker is true otherwise optional + pr_comment_message: "[test]" + # optional + image_url: quay.io/rhscl/cwt-generator + From 85e37db98721926232ceaf1b63522ef6e8e253ee Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Sun, 26 Apr 2020 08:25:47 +0200 Subject: [PATCH 3/9] Re-introduce release label for a while to fix OSBS tags For more info see: https://pagure.io/ContainerSIG/container-sig/issue/36 --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index c92b668..723a21e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,7 @@ functionality. Additionally, s2i-base also contains various libraries needed for it to serve as a base for other builder images, like s2i-python or s2i-ruby." \ NAME=s2i-base \ VERSION=1 \ + RELEASE=40 \ ARCH=x86_64 LABEL summary="$SUMMARY" \ @@ -18,6 +19,7 @@ LABEL summary="$SUMMARY" \ com.redhat.component="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ + release="$RELEASE.$DISTTAG" \ maintainer="SoftwareCollections.org " # This is the list of basic dependencies that all language container image can From 9b4236da8b62b96a544e0af7bb55567982ebe728 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Sun, 26 Apr 2020 08:54:00 +0200 Subject: [PATCH 4/9] Try to fix release label for OSBS --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 723a21e..23ea67f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ LABEL summary="$SUMMARY" \ com.redhat.component="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ - release="$RELEASE.$DISTTAG" \ + release="$RELEASE" \ maintainer="SoftwareCollections.org " # This is the list of basic dependencies that all language container image can From 8e5edc37bb7428e3c25bf31e62278d70ffabad69 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Wed, 29 Apr 2020 13:21:49 +0200 Subject: [PATCH 5/9] One more try to fix OSBS dist tag (insp. by redis) --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 23ea67f..c6039de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ functionality. Additionally, s2i-base also contains various libraries needed for it to serve as a base for other builder images, like s2i-python or s2i-ruby." \ NAME=s2i-base \ VERSION=1 \ - RELEASE=40 \ + RELEASE=43 \ ARCH=x86_64 LABEL summary="$SUMMARY" \ @@ -19,7 +19,7 @@ LABEL summary="$SUMMARY" \ com.redhat.component="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ - release="$RELEASE" \ + release="43.container" \ maintainer="SoftwareCollections.org " # This is the list of basic dependencies that all language container image can From 7111e41a28654f0af8256eb3d551be7f600cda30 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Wed, 29 Apr 2020 14:05:05 +0200 Subject: [PATCH 6/9] Remove RELEASE back and see what will happen --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c6039de..c92b668 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,6 @@ functionality. Additionally, s2i-base also contains various libraries needed for it to serve as a base for other builder images, like s2i-python or s2i-ruby." \ NAME=s2i-base \ VERSION=1 \ - RELEASE=43 \ ARCH=x86_64 LABEL summary="$SUMMARY" \ @@ -19,7 +18,6 @@ LABEL summary="$SUMMARY" \ com.redhat.component="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ - release="43.container" \ maintainer="SoftwareCollections.org " # This is the list of basic dependencies that all language container image can From 7af55be07fb59228333f46b3053301655290dc32 Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Mon, 13 Jul 2020 12:28:57 +0000 Subject: [PATCH 7/9] Update bot-cfg.yml --- bot-cfg.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot-cfg.yml b/bot-cfg.yml index 1219746..d40b2ac 100644 --- a/bot-cfg.yml +++ b/bot-cfg.yml @@ -1,4 +1,4 @@ - version: "1" +version: "1" betka: # is betka enabled for this repository From 5c3a7037bcfdbdf761921bb90a82bf69fb109be7 Mon Sep 17 00:00:00 2001 From: Petr Kubat Date: Mon, 21 Sep 2020 14:28:39 +0200 Subject: [PATCH 8/9] Move to Fedora 33 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c92b668..ce3bc16 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # This image is the base image for all OpenShift v3 language container images. -FROM registry.fedoraproject.org/f32/s2i-core:latest +FROM registry.fedoraproject.org/f33/s2i-core:latest ENV SUMMARY="Base image with essential libraries and tools used as a base for \ builder images like perl, python, ruby, etc." \ From d191a45d64acced493d5e41c0e40f35bb8c6780d Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Wed, 25 Nov 2020 11:26:57 +0100 Subject: [PATCH 9/9] Update from the upstream Github repository --- README.md | 2 +- test/run | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7b4156a..c6ace01 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ $ make build VERSIONS=base TARGET=rhel7 This image is available on DockerHub. To download it run: ```console -podman pull sclorg/s2i-base-centos7 +podman pull quay.io/centos7/s2i-base-centos7 ``` To build a Base image from scratch run: diff --git a/test/run b/test/run index a745d6d..ba51036 100755 --- a/test/run +++ b/test/run @@ -6,7 +6,7 @@ # IMAGE_NAME specifies a name of the candidate image used for testing. # The image has to be available before this script is executed. # -IMAGE_NAME=${IMAGE_NAME-centos/s2i-base-centos7-candidate} +test -n "${IMAGE_NAME-}" || { echo 'make sure $IMAGE_NAME is defined'; exit 1; } test_docker_run_usage() { echo "Testing 'docker run' usage..."