From 6f8099e9dd2a1b6ae39e29a170d960885479c471 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Fri, 4 May 2018 08:53:14 +0200 Subject: [PATCH 01/12] Bump the release --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b7487e4..99f3073 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ with all the tools needed to use source-to-image functionality while keeping \ the image size as small as possible." \ NAME=s2i-core \ VERSION=0 \ - RELEASE=2 \ + RELEASE=3 \ ARCH=x86_64 LABEL summary="$SUMMARY" \ From ba6bad827c39148d5204d151349c0b753c1da4d2 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 21 May 2018 14:19:22 +0000 Subject: [PATCH 02/12] "Bump RELEASE for automatic rebuild" --- Dockerfile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 99f3073..53fa62a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,7 @@ # This image is the base image for all s2i configurable container images. FROM registry.fedoraproject.org/fedora:28 -ENV SUMMARY="Base image which allows using of source-to-image." \ - DESCRIPTION="The s2i-core image provides any images layered on top of it \ -with all the tools needed to use source-to-image functionality while keeping \ -the image size as small as possible." \ - NAME=s2i-core \ - VERSION=0 \ - RELEASE=3 \ - ARCH=x86_64 +ENV SUMMARY="Base image which allows using of source-to-image." DESCRIPTION="The s2i-core image provides any images layered on top of it with all the tools needed to use source-to-image functionality while keeping the image size as small as possible." NAME=s2i-core VERSION=0 RELEASE=4 ARCH=x86_64 LABEL summary="$SUMMARY" \ description="$DESCRIPTION" \ From 05edf6d87c7c2112596fd5c5041eef67b2ecea9f Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 21 May 2018 17:56:12 +0000 Subject: [PATCH 03/12] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 53fa62a..b68f4c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # This image is the base image for all s2i configurable container images. FROM registry.fedoraproject.org/fedora:28 -ENV SUMMARY="Base image which allows using of source-to-image." DESCRIPTION="The s2i-core image provides any images layered on top of it with all the tools needed to use source-to-image functionality while keeping the image size as small as possible." NAME=s2i-core VERSION=0 RELEASE=4 ARCH=x86_64 +ENV SUMMARY="Base image which allows using of source-to-image." DESCRIPTION="The s2i-core image provides any images layered on top of it with all the tools needed to use source-to-image functionality while keeping the image size as small as possible." NAME=s2i-core VERSION=0 RELEASE=5 ARCH=x86_64 LABEL summary="$SUMMARY" \ description="$DESCRIPTION" \ From 1b5cf8b7c0240d8b5b8d4fb14ac2fbff2bce3bae Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Wed, 30 May 2018 19:20:23 +0000 Subject: [PATCH 04/12] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b68f4c3..708ceaa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # This image is the base image for all s2i configurable container images. FROM registry.fedoraproject.org/fedora:28 -ENV SUMMARY="Base image which allows using of source-to-image." DESCRIPTION="The s2i-core image provides any images layered on top of it with all the tools needed to use source-to-image functionality while keeping the image size as small as possible." NAME=s2i-core VERSION=0 RELEASE=5 ARCH=x86_64 +ENV SUMMARY="Base image which allows using of source-to-image." DESCRIPTION="The s2i-core image provides any images layered on top of it with all the tools needed to use source-to-image functionality while keeping the image size as small as possible." NAME=s2i-core VERSION=0 RELEASE=6 ARCH=x86_64 LABEL summary="$SUMMARY" \ description="$DESCRIPTION" \ From a62acf4707abc3afd656ea7ba6a478e953df9aff Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Wed, 27 Jun 2018 12:29:59 +0200 Subject: [PATCH 05/12] Pull changes from upstream master (3bb932c) --- Dockerfile | 16 ++++++++-------- root/usr/bin/prepare-yum-repositories | 15 +++++++++++++-- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 708ceaa..74a6666 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,14 @@ # This image is the base image for all s2i configurable container images. FROM registry.fedoraproject.org/fedora:28 -ENV SUMMARY="Base image which allows using of source-to-image." DESCRIPTION="The s2i-core image provides any images layered on top of it with all the tools needed to use source-to-image functionality while keeping the image size as small as possible." NAME=s2i-core VERSION=0 RELEASE=6 ARCH=x86_64 +ENV SUMMARY="Base image which allows using of source-to-image." \ + DESCRIPTION="The s2i-core image provides any images layered on top of it \ +with all the tools needed to use source-to-image functionality while keeping \ +the image size as small as possible." \ + NAME=s2i-core \ + VERSION=0 \ + RELEASE="7" \ + ARCH=x86_64 LABEL summary="$SUMMARY" \ description="$DESCRIPTION" \ @@ -27,13 +34,6 @@ ENV \ HOME=/opt/app-root/src \ PATH=/opt/app-root/src/bin:/opt/app-root/bin:$PATH -# When bash is started non-interactively, to run a shell script, for example it -# looks for this variable and source the content of this file. This will enable -# the SCL for all scripts without need to do 'scl enable'. -ENV BASH_ENV=${APP_ROOT}/etc/scl_enable \ - ENV=${APP_ROOT}/etc/scl_enable \ - PROMPT_COMMAND=". ${APP_ROOT}/etc/scl_enable" - # This is the list of basic dependencies that all language container image can # consume. # Also setup the 'openshift' user that is used for the build execution and for the diff --git a/root/usr/bin/prepare-yum-repositories b/root/usr/bin/prepare-yum-repositories index 850701b..3b28993 100755 --- a/root/usr/bin/prepare-yum-repositories +++ b/root/usr/bin/prepare-yum-repositories @@ -1,6 +1,15 @@ #!/bin/bash # This script is used to prepare yum repositories, that are given as arguments. +# It is no-op if user also mounts the repo file(s) into the container during +# image build. This can be done by one of those commands: +# +# docker build -v /some/repo/file:/etc/yum.repos.d/sclorg_custom.repo +# docker build -v /some/repo/directory:/etc/yum.repos.d +# make CUSTOM_REPO=/some/repo/file/or/directory +# +# The last one works for projects where we have Makefile with the +# container-common-scripts support. set -ex @@ -20,8 +29,10 @@ function is_subscribed() { return 1 } -# if redhat.repo does not exist we have a mounted-in dir, do not enable repositories -[ -f /etc/yum.repos.d/redhat.repo ] || SKIP_REPOS_ENABLE=true +# DEBUGGING CASE! Mostly for 'make CUSTOM_REPO=/some/file/or/dir'. +test ! -f /etc/yum.repos.d/sclorg_custom.repo && \ +! mountpoint /etc/yum.repos.d \ + || exit 0 # install yum-utils for yum-config-manager yum install -y yum-utils From b8e0f1b599ef1992f4f74baee42b15366d42903c Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 9 Jul 2018 13:31:43 +0000 Subject: [PATCH 06/12] "Bump RELEASE for automatic rebuild" --- Dockerfile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 74a6666..37f042a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,7 @@ # This image is the base image for all s2i configurable container images. FROM registry.fedoraproject.org/fedora:28 -ENV SUMMARY="Base image which allows using of source-to-image." \ - DESCRIPTION="The s2i-core image provides any images layered on top of it \ -with all the tools needed to use source-to-image functionality while keeping \ -the image size as small as possible." \ - NAME=s2i-core \ - VERSION=0 \ - RELEASE="7" \ - ARCH=x86_64 +ENV SUMMARY="Base image which allows using of source-to-image." DESCRIPTION="The s2i-core image provides any images layered on top of it with all the tools needed to use source-to-image functionality while keeping the image size as small as possible." NAME=s2i-core VERSION=0 RELEASE=8 ARCH=x86_64 LABEL summary="$SUMMARY" \ description="$DESCRIPTION" \ From 5509f0026db3a93b6cd445cf6103d631fe691a40 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 23 Jul 2018 13:09:44 +0000 Subject: [PATCH 07/12] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 37f042a..bf1a9ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # This image is the base image for all s2i configurable container images. FROM registry.fedoraproject.org/fedora:28 -ENV SUMMARY="Base image which allows using of source-to-image." DESCRIPTION="The s2i-core image provides any images layered on top of it with all the tools needed to use source-to-image functionality while keeping the image size as small as possible." NAME=s2i-core VERSION=0 RELEASE=8 ARCH=x86_64 +ENV SUMMARY="Base image which allows using of source-to-image." DESCRIPTION="The s2i-core image provides any images layered on top of it with all the tools needed to use source-to-image functionality while keeping the image size as small as possible." NAME=s2i-core VERSION=0 RELEASE=9 ARCH=x86_64 LABEL summary="$SUMMARY" \ description="$DESCRIPTION" \ From 7b535154659772345ee38c69b72a3e30c50df54e Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Tue, 24 Jul 2018 17:21:36 +0200 Subject: [PATCH 08/12] Use just groff-base in s2i-core --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1ed5d88..adeffb0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ with all the tools needed to use source-to-image functionality while keeping \ the image size as small as possible." \ NAME=s2i-core \ VERSION=0 \ - RELEASE=9 \ + RELEASE=10 \ ARCH=x86_64 LABEL summary="$SUMMARY" \ @@ -42,7 +42,7 @@ ENV \ RUN INSTALL_PKGS="bsdtar \ findutils \ gettext \ - groff \ + groff-base \ tar \ unzip" && \ mkdir -p ${HOME}/.pki/nssdb && \ From 8c10bb45276864114258d5161a21a1051ee6e20b Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 24 Jul 2018 18:51:17 +0000 Subject: [PATCH 09/12] "Bump RELEASE for automatic rebuild" --- Dockerfile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index adeffb0..a995430 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,7 @@ # This image is the base image for all s2i configurable container images. FROM registry.fedoraproject.org/fedora:28 -ENV SUMMARY="Base image which allows using of source-to-image." \ - DESCRIPTION="The s2i-core image provides any images layered on top of it \ -with all the tools needed to use source-to-image functionality while keeping \ -the image size as small as possible." \ - NAME=s2i-core \ - VERSION=0 \ - RELEASE=10 \ - ARCH=x86_64 +ENV SUMMARY="Base image which allows using of source-to-image." DESCRIPTION="The s2i-core image provides any images layered on top of it with all the tools needed to use source-to-image functionality while keeping the image size as small as possible." NAME=s2i-core VERSION=0 RELEASE=11 ARCH=x86_64 LABEL summary="$SUMMARY" \ description="$DESCRIPTION" \ From 87387b46923804f63f8f4043c18869397beb8518 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 27 Aug 2018 10:35:39 +0200 Subject: [PATCH 10/12] Drop Release label in favor of OSBS release_bump plugin. OSBS can automatically bump the release number, for that we just need to drop the label from the Dockerfile See https://pagure.io/ContainerSIG/container-sig/issue/1 Signed-off-by: Clement Verna --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a995430..da22e69 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # This image is the base image for all s2i configurable container images. FROM registry.fedoraproject.org/fedora:28 -ENV SUMMARY="Base image which allows using of source-to-image." DESCRIPTION="The s2i-core image provides any images layered on top of it with all the tools needed to use source-to-image functionality while keeping the image size as small as possible." NAME=s2i-core VERSION=0 RELEASE=11 ARCH=x86_64 +ENV SUMMARY="Base image which allows using of source-to-image." DESCRIPTION="The s2i-core image provides any images layered on top of it with all the tools needed to use source-to-image functionality while keeping the image size as small as possible." NAME=s2i-core VERSION=0 ARCH=x86_64 LABEL summary="$SUMMARY" \ description="$DESCRIPTION" \ @@ -12,7 +12,6 @@ LABEL summary="$SUMMARY" \ com.redhat.component="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ - release="$RELEASE.$DISTTAG" \ architecture="$ARCH" \ usage="This image is supposed to be used as a base image for other images that support source-to-image" \ maintainer="SoftwareCollections.org " From 264acb0ff29637f9def9376821ff13c55ca27d56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Skalick=C3=BD?= Date: Mon, 29 Oct 2018 09:35:10 +0000 Subject: [PATCH 11/12] Pull changes from upstream repository. --- Dockerfile | 9 +++++++-- Dockerfile.fedora | 1 + help.md | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) create mode 120000 Dockerfile.fedora create mode 120000 help.md diff --git a/Dockerfile b/Dockerfile index da22e69..73f94f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,13 @@ # This image is the base image for all s2i configurable container images. FROM registry.fedoraproject.org/fedora:28 -ENV SUMMARY="Base image which allows using of source-to-image." DESCRIPTION="The s2i-core image provides any images layered on top of it with all the tools needed to use source-to-image functionality while keeping the image size as small as possible." NAME=s2i-core VERSION=0 ARCH=x86_64 +ENV SUMMARY="Base image which allows using of source-to-image." \ + DESCRIPTION="The s2i-core image provides any images layered on top of it \ +with all the tools needed to use source-to-image functionality while keeping \ +the image size as small as possible." \ + NAME=s2i-core \ + VERSION=0 \ + ARCH=x86_64 LABEL summary="$SUMMARY" \ description="$DESCRIPTION" \ @@ -12,7 +18,6 @@ LABEL summary="$SUMMARY" \ com.redhat.component="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ - architecture="$ARCH" \ usage="This image is supposed to be used as a base image for other images that support source-to-image" \ maintainer="SoftwareCollections.org " diff --git a/Dockerfile.fedora b/Dockerfile.fedora new file mode 120000 index 0000000..1d1fe94 --- /dev/null +++ b/Dockerfile.fedora @@ -0,0 +1 @@ +Dockerfile \ No newline at end of file diff --git a/help.md b/help.md new file mode 120000 index 0000000..42061c0 --- /dev/null +++ b/help.md @@ -0,0 +1 @@ +README.md \ No newline at end of file From d52ccdfb9679fdfe8b7b67ae737786dfc773afce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Skalick=C3=BD?= Date: Mon, 29 Oct 2018 14:11:03 +0000 Subject: [PATCH 12/12] Add versioned symlink - needed by some images. --- core | 1 + 1 file changed, 1 insertion(+) create mode 120000 core diff --git a/core b/core new file mode 120000 index 0000000..945c9b4 --- /dev/null +++ b/core @@ -0,0 +1 @@ +. \ No newline at end of file