Skip to content

Commit 34bb9b3

Browse files
mcyprianmcyprian
committed
Generate Dockerfiles using distgen
1 parent 99e8f07 commit 34bb9b3

17 files changed

Lines changed: 297 additions & 63 deletions

‎2.7/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ LABEL summary="$SUMMARY" \
3333
usage="s2i build https://github.com/sclorg/s2i-python-container.git --context-dir=2.7/test/setup-test-app/ centos/python-27-centos7 python-sample-app" \
3434
maintainer="SoftwareCollections.org <sclorg@redhat.com>"
3535

36-
RUN yum install -y centos-release-scl && \
37-
INSTALL_PKGS="libjpeg-turbo libjpeg-turbo-devel python27 python27-python-devel python27-python-setuptools \
38-
python27-python-pip nss_wrapper httpd24 httpd24-httpd-devel httpd24-mod_ssl httpd24-mod_auth_kerb \
39-
httpd24-mod_ldap httpd24-mod_session atlas-devel gcc-gfortran libffi-devel libtool-ltdl enchant" && \
40-
yum install -y --setopt=tsflags=nodocs --enablerepo=centosplus $INSTALL_PKGS && \
36+
RUN INSTALL_PKGS="libjpeg-turbo libjpeg-turbo-devel python27 python27-python-devel python27-python-setuptools \
37+
python27-python-pip nss_wrapper httpd24 httpd24-httpd-devel httpd24-mod_ssl \
38+
httpd24-mod_auth_kerb httpd24-mod_ldap httpd24-mod_session atlas-devel gcc-gfortran \
39+
libffi-devel libtool-ltdl enchant" && \
40+
yum install -y centos-release-scl && \
41+
yum -y --setopt=tsflags=nodocs install --enablerepo=centosplus $INSTALL_PKGS && \
4142
rpm -V $INSTALL_PKGS && \
42-
# Remove centos-logos (httpd dependency, ~20MB of graphics) to keep image
43-
# size smaller.
43+
# Remove centos-logos (httpd dependency) to keep image size smaller.
4444
rpm -e --nodeps centos-logos && \
45-
yum clean all -y
45+
yum -y clean all --enablerepo='*'
4646

4747
# Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH.
4848
COPY ./s2i/bin/ $STI_SCRIPTS_PATH

‎2.7/Dockerfile.rhel7‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ LABEL summary="$SUMMARY" \
3333
usage="s2i build https://github.com/sclorg/s2i-python-container.git --context-dir=2.7/test/setup-test-app/ rhscl/python-27-rhel7 python-sample-app" \
3434
maintainer="SoftwareCollections.org <sclorg@redhat.com>"
3535

36-
RUN yum install -y yum-utils && \
37-
prepare-yum-repositories rhel-server-rhscl-7-rpms && \
38-
INSTALL_PKGS="python27 python27-python-devel python27-python-setuptools python27-python-pip \
39-
nss_wrapper httpd24 httpd24-httpd-devel httpd24-mod_ssl httpd24-mod_auth_kerb httpd24-mod_ldap \
36+
RUN INSTALL_PKGS="python27 python27-python-devel python27-python-setuptools python27-python-pip nss_wrapper \
37+
httpd24 httpd24-httpd-devel httpd24-mod_ssl httpd24-mod_auth_kerb httpd24-mod_ldap \
4038
httpd24-mod_session atlas-devel gcc-gfortran libffi-devel libtool-ltdl enchant" && \
41-
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
39+
yum install -y yum-utils && \
40+
prepare-yum-repositories rhel-server-rhscl-7-rpms && \
41+
yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \
4242
rpm -V $INSTALL_PKGS && \
4343
# Remove redhat-logos (httpd dependency) to keep image size smaller.
4444
rpm -e --nodeps redhat-logos && \
45-
yum clean all -y
45+
yum -y clean all --enablerepo='*'
4646

4747
# Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH.
4848
COPY ./s2i/bin/ $STI_SCRIPTS_PATH

‎3.4/Dockerfile‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,15 @@ LABEL summary="$SUMMARY" \
3333
usage="s2i build https://github.com/sclorg/s2i-python-container.git --context-dir=3.4/test/setup-test-app/ centos/python-34-centos7 python-sample-app" \
3434
maintainer="SoftwareCollections.org <sclorg@redhat.com>"
3535

36-
RUN yum install -y centos-release-scl && \
37-
INSTALL_PKGS="rh-python34 rh-python34-python-devel rh-python34-python-setuptools rh-python34-python-pip \
38-
nss_wrapper httpd24 httpd24-httpd-devel httpd24-mod_ssl httpd24-mod_auth_kerb httpd24-mod_ldap \
36+
RUN INSTALL_PKGS="rh-python34 rh-python34-python-devel rh-python34-python-setuptools rh-python34-python-pip nss_wrapper \
37+
httpd24 httpd24-httpd-devel httpd24-mod_ssl httpd24-mod_auth_kerb httpd24-mod_ldap \
3938
httpd24-mod_session atlas-devel gcc-gfortran libffi-devel libtool-ltdl enchant" && \
40-
yum install -y --setopt=tsflags=nodocs --enablerepo=centosplus $INSTALL_PKGS && \
39+
yum install -y centos-release-scl && \
40+
yum -y --setopt=tsflags=nodocs install --enablerepo=centosplus $INSTALL_PKGS && \
4141
rpm -V $INSTALL_PKGS && \
42-
# Remove centos-logos (httpd dependency, ~20MB of graphics) to keep image
43-
# size smaller.
42+
# Remove centos-logos (httpd dependency) to keep image size smaller.
4443
rpm -e --nodeps centos-logos && \
45-
yum clean all -y
44+
yum -y clean all --enablerepo='*'
4645

4746
# Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH.
4847
COPY ./s2i/bin/ $STI_SCRIPTS_PATH

‎3.4/Dockerfile.rhel7‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ LABEL summary="$SUMMARY" \
3333
usage="s2i build https://github.com/sclorg/s2i-python-container.git --context-dir=3.4/test/setup-test-app/ rhscl/python-34-rhel7 python-sample-app" \
3434
maintainer="SoftwareCollections.org <sclorg@redhat.com>"
3535

36-
RUN yum install -y yum-utils && \
36+
RUN INSTALL_PKGS="rh-python34 rh-python34-python-devel rh-python34-python-setuptools rh-python34-python-pip nss_wrapper \
37+
httpd24 httpd24-httpd-devel httpd24-mod_ssl httpd24-mod_auth_kerb httpd24-mod_ldap \
38+
httpd24-mod_session atlas-devel gcc-gfortran libffi-devel libtool-ltdl enchant" && \
39+
yum install -y yum-utils && \
3740
prepare-yum-repositories rhel-server-rhscl-7-rpms && \
38-
INSTALL_PKGS="rh-python34 rh-python34-python-devel rh-python34-python-setuptools rh-python34-python-pip nss_wrapper httpd24 \
39-
httpd24-httpd-devel httpd24-mod_ssl httpd24-mod_auth_kerb httpd24-mod_ldap httpd24-mod_session \
40-
atlas-devel gcc-gfortran libffi-devel libtool-ltdl enchant" && \
41-
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
41+
yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \
4242
rpm -V $INSTALL_PKGS && \
4343
# Remove redhat-logos (httpd dependency) to keep image size smaller.
4444
rpm -e --nodeps redhat-logos && \
45-
yum clean all -y
45+
yum -y clean all --enablerepo='*'
4646

4747
# Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH.
4848
COPY ./s2i/bin/ $STI_SCRIPTS_PATH

‎3.5/Dockerfile‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,15 @@ LABEL summary="$SUMMARY" \
3333
usage="s2i build https://github.com/sclorg/s2i-python-container.git --context-dir=3.5/test/setup-test-app/ centos/python-35-centos7 python-sample-app" \
3434
maintainer="SoftwareCollections.org <sclorg@redhat.com>"
3535

36-
RUN yum install -y centos-release-scl-rh && \
37-
yum-config-manager --enable centos-sclo-rh-testing && \
38-
INSTALL_PKGS="rh-python35 rh-python35-python-devel rh-python35-python-setuptools rh-python35-python-pip \
39-
nss_wrapper httpd24 httpd24-httpd-devel httpd24-mod_ssl httpd24-mod_auth_kerb httpd24-mod_ldap \
40-
httpd24-mod_session atlas-devel gcc-gfortran libffi-devel libtool-ltdl enchant" && \
41-
yum install -y --setopt=tsflags=nodocs --enablerepo=centosplus $INSTALL_PKGS && \
36+
RUN INSTALL_PKGS="rh-python35 rh-python35-python-devel rh-python35-python-setuptools rh-python35-python-pip nss_wrapper \
37+
httpd24 httpd24-httpd-devel httpd24-mod_ssl httpd24-mod_auth_kerb httpd24-mod_ldap \
38+
httpd24-mod_session atlas-devel gcc-gfortran libffi-devel libtool-ltdl enchant" && \
39+
yum install -y centos-release-scl && \
40+
yum -y --setopt=tsflags=nodocs install --enablerepo=centosplus $INSTALL_PKGS && \
4241
rpm -V $INSTALL_PKGS && \
43-
# Remove centos-logos (httpd dependency, ~20MB of graphics) to keep image
44-
# size smaller.
42+
# Remove centos-logos (httpd dependency) to keep image size smaller.
4543
rpm -e --nodeps centos-logos && \
46-
yum clean all -y
44+
yum -y clean all --enablerepo='*'
4745

4846
# Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH.
4947
COPY ./s2i/bin/ $STI_SCRIPTS_PATH

‎3.5/Dockerfile.rhel7‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ LABEL summary="$SUMMARY" \
3333
usage="s2i build https://github.com/sclorg/s2i-python-container.git --context-dir=3.5/test/setup-test-app/ rhscl/python-35-rhel7 python-sample-app" \
3434
maintainer="SoftwareCollections.org <sclorg@redhat.com>"
3535

36-
RUN yum install -y yum-utils && \
36+
RUN INSTALL_PKGS="rh-python35 rh-python35-python-devel rh-python35-python-setuptools rh-python35-python-pip nss_wrapper \
37+
httpd24 httpd24-httpd-devel httpd24-mod_ssl httpd24-mod_auth_kerb httpd24-mod_ldap \
38+
httpd24-mod_session atlas-devel gcc-gfortran libffi-devel libtool-ltdl enchant" && \
39+
yum install -y yum-utils && \
3740
prepare-yum-repositories rhel-server-rhscl-7-rpms && \
38-
INSTALL_PKGS="rh-python35 rh-python35-python-devel rh-python35-python-setuptools rh-python35-python-pip \
39-
nss_wrapper httpd24 httpd24-httpd-devel httpd24-mod_ssl httpd24-mod_auth_kerb httpd24-mod_ldap httpd24-mod_session \
40-
atlas-devel gcc-gfortran libffi-devel libtool-ltdl enchant" && \
41-
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
41+
yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \
4242
rpm -V $INSTALL_PKGS && \
4343
# Remove redhat-logos (httpd dependency) to keep image size smaller.
4444
rpm -e --nodeps redhat-logos && \
45-
yum clean all -y
45+
yum -y clean all --enablerepo='*'
4646

4747
# Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH.
4848
COPY ./s2i/bin/ $STI_SCRIPTS_PATH

‎3.6/Dockerfile‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,15 @@ LABEL summary="$SUMMARY" \
3333
usage="s2i build https://github.com/sclorg/s2i-python-container.git --context-dir=3.6/test/setup-test-app/ centos/python-36-centos7 python-sample-app" \
3434
maintainer="SoftwareCollections.org <sclorg@redhat.com>"
3535

36-
RUN yum install -y centos-release-scl-rh && \
37-
yum-config-manager --enable centos-sclo-rh-testing && \
38-
INSTALL_PKGS="rh-python36 rh-python36-python-devel rh-python36-python-setuptools rh-python36-python-pip \
39-
nss_wrapper httpd24 httpd24-httpd-devel httpd24-mod_ssl httpd24-mod_auth_kerb httpd24-mod_ldap \
40-
httpd24-mod_session atlas-devel gcc-gfortran libffi-devel libtool-ltdl enchant" && \
41-
yum install -y --setopt=tsflags=nodocs --enablerepo=centosplus $INSTALL_PKGS && \
36+
RUN INSTALL_PKGS="rh-python36 rh-python36-python-devel rh-python36-python-setuptools rh-python36-python-pip nss_wrapper \
37+
httpd24 httpd24-httpd-devel httpd24-mod_ssl httpd24-mod_auth_kerb httpd24-mod_ldap \
38+
httpd24-mod_session atlas-devel gcc-gfortran libffi-devel libtool-ltdl enchant" && \
39+
yum install -y centos-release-scl && \
40+
yum -y --setopt=tsflags=nodocs install --enablerepo=centosplus $INSTALL_PKGS && \
4241
rpm -V $INSTALL_PKGS && \
43-
# Remove centos-logos (httpd dependency, ~20MB of graphics) to keep image
44-
# size smaller.
42+
# Remove centos-logos (httpd dependency) to keep image size smaller.
4543
rpm -e --nodeps centos-logos && \
46-
yum clean all -y
44+
yum -y clean all --enablerepo='*'
4745

4846
# Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH.
4947
COPY ./s2i/bin/ $STI_SCRIPTS_PATH

‎3.6/Dockerfile.fedora‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ LABEL summary="$SUMMARY" \
4141
maintainer="SoftwareCollections.org <sclorg@redhat.com>"
4242

4343
RUN INSTALL_PKGS="python3 python3-devel python3-setuptools python3-pip python3-virtualenv \
44-
nss_wrapper httpd httpd-devel atlas-devel gcc-gfortran libffi-devel libtool-ltdl \
45-
enchant" && \
46-
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
44+
nss_wrapper httpd httpd-devel atlas-devel gcc-gfortran \
45+
libffi-devel libtool-ltdl enchant" && \
46+
dnf -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \
4747
rpm -V $INSTALL_PKGS && \
48-
dnf clean all -y
48+
dnf -y clean all --enablerepo='*'
4949

5050
# Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH.
5151
COPY ./s2i/bin/ $STI_SCRIPTS_PATH

‎3.6/Dockerfile.rhel7‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ LABEL summary="$SUMMARY" \
3333
usage="s2i build https://github.com/sclorg/s2i-python-container.git --context-dir=3.6/test/setup-test-app/ rhscl/python-36-rhel7 python-sample-app" \
3434
maintainer="SoftwareCollections.org <sclorg@redhat.com>"
3535

36-
RUN yum install -y yum-utils && \
36+
RUN INSTALL_PKGS="rh-python36 rh-python36-python-devel rh-python36-python-setuptools rh-python36-python-pip nss_wrapper \
37+
httpd24 httpd24-httpd-devel httpd24-mod_ssl httpd24-mod_auth_kerb httpd24-mod_ldap \
38+
httpd24-mod_session atlas-devel gcc-gfortran libffi-devel libtool-ltdl enchant" && \
39+
yum install -y yum-utils && \
3740
prepare-yum-repositories rhel-server-rhscl-7-rpms && \
38-
INSTALL_PKGS="rh-python36 rh-python36-python-devel rh-python36-python-setuptools rh-python36-python-pip \
39-
nss_wrapper httpd24 httpd24-httpd-devel httpd24-mod_ssl httpd24-mod_auth_kerb httpd24-mod_ldap httpd24-mod_session \
40-
atlas-devel gcc-gfortran libffi-devel libtool-ltdl enchant" && \
41-
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
41+
yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \
4242
rpm -V $INSTALL_PKGS && \
4343
# Remove redhat-logos (httpd dependency) to keep image size smaller.
4444
rpm -e --nodeps redhat-logos && \
45-
yum clean all -y
45+
yum -y clean all --enablerepo='*'
4646

4747
# Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH.
4848
COPY ./s2i/bin/ $STI_SCRIPTS_PATH

‎README.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@ The resulting image can be run using [Docker](http://docker.io).
1010
For more information about using these images with OpenShift, please see the
1111
official [OpenShift Documentation](https://docs.openshift.org/latest/using_images/s2i_images/python.html).
1212

13-
For more information about contributing, see
14-
[the Contribution Guidelines](https://github.com/sclorg/welcome/blob/master/contribution.md).
1513
For more information about concepts used in these container images, see the
1614
[Landing page](https://github.com/sclorg/welcome).
1715

16+
Contributing
17+
---------------
18+
In this repository [distgen](https://github.com/devexp-db/distgen/) > 0.14 is used for generating Dockerfiles. If you'd like update a Dockerfile, please make changes in specs/multispec.yml and/or templates under src/ (or other distgen file) and run `make generate-all`.
19+
20+
For more information about contributing, see
21+
[the Contribution Guidelines](https://github.com/sclorg/welcome/blob/master/contribution.md).
1822

1923
Versions
2024
---------------

0 commit comments

Comments
 (0)