From f243d26dfc4caa8ec83b0d1d40baf44dabace50c Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Fri, 20 Apr 2018 14:10:34 +0000 Subject: [PATCH 1/9] "Bump RELEASE for automatic rebuild" --- Dockerfile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 24be6a4..363a4c2 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:27 -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=1 \ - 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=2 ARCH=x86_64 LABEL summary="$SUMMARY" \ description="$DESCRIPTION" \ From c02747e4fa00942ecc2f069c61288a875a7671b6 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 21 May 2018 15:53:07 +0000 Subject: [PATCH 2/9] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 363a4c2..21e6308 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:27 -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=2 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=3 ARCH=x86_64 LABEL summary="$SUMMARY" \ description="$DESCRIPTION" \ From 22057002611741089ef8096e613b1b235f8214bf Mon Sep 17 00:00:00 2001 From: Petr Kubat Date: Thu, 24 May 2018 09:42:41 +0200 Subject: [PATCH 3/9] 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 21e6308..cb0cc41 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:27 -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" \ @@ -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 c7888230ebcc06f5bac3adb40ca176025983001e Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Fri, 6 Jul 2018 13:41:20 +0000 Subject: [PATCH 4/9] "Bump RELEASE for automatic rebuild" --- Dockerfile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index cb0cc41..84a0896 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:27 -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 af689750c2abb72535f830e7eb122dbc133205bc Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 17 Jul 2018 13:03:22 +0000 Subject: [PATCH 5/9] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 84a0896..fb9290e 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:27 -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 dcaf5b1ca73e9ee6a5dc305c20b216e4985c043a Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 17 Jul 2018 18:45:46 +0000 Subject: [PATCH 6/9] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fb9290e..906b323 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:27 -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" \ From dfbbacfa5982bdb69c3380c195c6f8a4e23929dd Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Tue, 24 Jul 2018 17:21:36 +0200 Subject: [PATCH 7/9] Use just groff-base in s2i-core --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6a0b458..29f6612 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # This image is the base image for all s2i configurable container images. -FROM registry.fedoraproject.org/fedora:27 +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 \ @@ -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=7 \ + RELEASE=8 \ 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 2db3cd8d555052d62a49dfcc7fe539100f9c0c2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Skalick=C3=BD?= Date: Fri, 26 Oct 2018 12:59:56 +0100 Subject: [PATCH 8/9] Pull changes from upstream repository. --- Dockerfile | 5 +---- Dockerfile.fedora | 1 + help.md | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) create mode 120000 Dockerfile.fedora create mode 120000 help.md diff --git a/Dockerfile b/Dockerfile index 29f6612..5209ec7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # This image is the base image for all s2i configurable container images. -FROM registry.fedoraproject.org/fedora:28 +FROM registry.fedoraproject.org/fedora:27 ENV SUMMARY="Base image which allows using of source-to-image." \ DESCRIPTION="The s2i-core image provides any images layered on top of it \ @@ -7,7 +7,6 @@ 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" \ @@ -19,8 +18,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 " 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 87a3ff53f417fe8653268290ec88c63d57727cec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Skalick=C3=BD?= Date: Tue, 13 Nov 2018 17:24:11 +0000 Subject: [PATCH 9/9] Pull changes from upstream and rebase for: latest Fedora base image --- 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