Skip to content

Commit b4de737

Browse files
ndavidovandavidova
committed
add manifest, cleanup dockerfile
1 parent 364a3ff commit b4de737

54 files changed

Lines changed: 85 additions & 796 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎2.4/Dockerfile.c10s‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ ENV HTTPD_VERSION=2.4 \
1212
HTTPD_SHORT_VERSION=24 \
1313
NAME=httpd \
1414
ARCH=x86_64
15-
1615
ENV SUMMARY="Platform for running Apache httpd ${HTTPD_VERSION} or building httpd-based application" \
1716
DESCRIPTION="Apache httpd ${HTTPD_VERSION} available as container, is a powerful, efficient, \
1817
and extensible web server. Apache supports a variety of features, many implemented as compiled modules \
@@ -27,7 +26,7 @@ LABEL summary="${SUMMARY}" \
2726
io.openshift.expose-services="8080:http,8443:https" \
2827
io.openshift.tags="builder,${NAME},${NAME}-${HTTPD_SHORT_VERSION}" \
2928
name="sclorg/${NAME}-${HTTPD_SHORT_VERSION}-c10s" \
30-
version="1" \
29+
version="${HTTPD_VERSION}" \
3130
com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \
3231
com.redhat.component="${NAME}-${HTTPD_SHORT_VERSION}-container" \
3332
usage="s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ quay.io/sclorg/${NAME}-${HTTPD_SHORT_VERSION}-c10s sample-server" \

‎2.4/Dockerfile.c9s‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ FROM quay.io/sclorg/s2i-core-c9s:c9s
1111
ENV HTTPD_VERSION=2.4 \
1212
HTTPD_SHORT_VERSION=24 \
1313
NAME=httpd
14-
1514
ENV SUMMARY="Platform for running Apache httpd ${HTTPD_VERSION} or building httpd-based application" \
1615
DESCRIPTION="Apache httpd ${HTTPD_VERSION} available as container, is a powerful, efficient, \
1716
and extensible web server. Apache supports a variety of features, many implemented as compiled modules \
@@ -26,7 +25,7 @@ LABEL summary="${SUMMARY}" \
2625
io.openshift.expose-services="8080:http,8443:https" \
2726
io.openshift.tags="builder,${NAME},${NAME}-${HTTPD_SHORT_VERSION}" \
2827
name="sclorg/${NAME}-${HTTPD_SHORT_VERSION}-c9s" \
29-
version="1" \
28+
version="${HTTPD_VERSION}" \
3029
com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \
3130
com.redhat.component="${NAME}-${HTTPD_SHORT_VERSION}-container" \
3231
usage="s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ quay.io/sclorg/${NAME}-${HTTPD_SHORT_VERSION}-c9s sample-server" \

‎2.4/Dockerfile.fedora‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ ENV HTTPD_VERSION=2.4 \
1212
HTTPD_SHORT_VERSION=24 \
1313
NAME=httpd \
1414
ARCH=x86_64
15-
1615
ENV SUMMARY="Platform for running Apache httpd ${HTTPD_VERSION} or building httpd-based application" \
1716
DESCRIPTION="Apache httpd ${HTTPD_VERSION} available as container, is a powerful, efficient, \
1817
and extensible web server. Apache supports a variety of features, many implemented as compiled modules \
@@ -26,17 +25,17 @@ LABEL summary="${SUMMARY}" \
2625
io.k8s.display-name="Apache httpd ${HTTPD_VERSION}" \
2726
io.openshift.expose-services="8080:http,8443:https" \
2827
io.openshift.tags="builder,${NAME},${NAME}${HTTPD_SHORT_VERSION}" \
29-
com.redhat.component="${NAME}" \
3028
name="fedora/${NAME}-${HTTPD_SHORT_VERSION}" \
3129
version="${HTTPD_VERSION}" \
30+
com.redhat.component="${NAME}" \
3231
usage="s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ quya.io/fedora/${NAME}-${HTTPD_SHORT_VERSION} sample-server" \
3332
maintainer="SoftwareCollections.org <sclorg@redhat.com>"
3433

3534
EXPOSE 8080
3635
EXPOSE 8443
3736

3837
RUN dnf install -y yum-utils gettext hostname && \
39-
INSTALL_PKGS="nss_wrapper-libs httpd mod_ssl mod_ldap mod_session mod_security sscg" && \
38+
INSTALL_PKGS="nss_wrapper-libs httpd mod_ssl mod_ldap mod_session mod_security sscg" && \
4039
dnf install -y --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
4140
httpd -v | grep -qe "Apache/${HTTPD_VERSION}" && echo "Found VERSION ${HTTPD_VERSION}" && \
4241
dnf clean all
@@ -56,7 +55,6 @@ ENV HTTPD_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/httpd/ \
5655
COPY ${HTTPD_VERSION}/s2i/bin/ ${STI_SCRIPTS_PATH}
5756
COPY ${HTTPD_VERSION}/root /
5857

59-
# Generate SSL certs and reset permissions of filesystem to default values
6058
# Reset permissions of filesystem to default values
6159
RUN /usr/libexec/httpd-prepare && rpm-file-permissions
6260

‎2.4/Dockerfile.rhel10‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ ENV HTTPD_VERSION=2.4 \
1212
HTTPD_SHORT_VERSION=24 \
1313
NAME=httpd \
1414
ARCH=x86_64
15-
1615
ENV SUMMARY="Platform for running Apache httpd ${HTTPD_VERSION} or building httpd-based application" \
1716
DESCRIPTION="Apache httpd ${HTTPD_VERSION} available as container, is a powerful, efficient, \
1817
and extensible web server. Apache supports a variety of features, many implemented as compiled modules \
@@ -27,6 +26,7 @@ LABEL summary="${SUMMARY}" \
2726
io.openshift.expose-services="8080:http,8443:https" \
2827
io.openshift.tags="builder,${NAME},${NAME}-${HTTPD_SHORT_VERSION}" \
2928
name="ubi10/${NAME}-${HTTPD_SHORT_VERSION}" \
29+
version="${HTTPD_VERSION}" \
3030
com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \
3131
com.redhat.component="${NAME}-${HTTPD_SHORT_VERSION}-container" \
3232
usage="s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ ubi10/${NAME}-${HTTPD_SHORT_VERSION} sample-server" \

‎2.4/Dockerfile.rhel8‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,24 @@ FROM ubi8/s2i-core:1
88
# Environment:
99
# * $HTTPD_LOG_TO_VOLUME (optional) - When set, httpd will log into /var/log/httpd24
1010

11-
ENV HTTPD_VERSION=2.4
12-
13-
ENV SUMMARY="Platform for running Apache httpd $HTTPD_VERSION or building httpd-based application" \
14-
DESCRIPTION="Apache httpd $HTTPD_VERSION available as container, is a powerful, efficient, \
11+
ENV HTTPD_VERSION=2.4 \
12+
HTTPD_SHORT_VERSION=24 \
13+
NAME=httpd
14+
ENV SUMMARY="Platform for running Apache httpd ${HTTPD_VERSION} or building httpd-based application" \
15+
DESCRIPTION="Apache httpd ${HTTPD_VERSION} available as container, is a powerful, efficient, \
1516
and extensible web server. Apache supports a variety of features, many implemented as compiled modules \
1617
which extend the core functionality. \
1718
These can range from server-side programming language support to authentication schemes. \
1819
Virtual hosting allows one Apache installation to serve many different Web sites."
1920

20-
LABEL summary="$SUMMARY" \
21-
description="$DESCRIPTION" \
22-
io.k8s.description="$DESCRIPTION" \
23-
io.k8s.display-name="Apache httpd $HTTPD_VERSION" \
21+
LABEL summary="${SUMMARY}" \
22+
description="${DESCRIPTION}" \
23+
io.k8s.description="${DESCRIPTION}" \
24+
io.k8s.display-name="Apache httpd ${HTTPD_VERSION}" \
2425
io.openshift.expose-services="8080:http,8443:https" \
25-
io.openshift.tags="builder,httpd,httpd-24" \
26+
io.openshift.tags="builder,${NAME},${NAME}-${HTTPD_SHORT_VERSION}" \
2627
name="rhel8/httpd-24" \
27-
version="1" \
28+
version="${HTTPD_VERSION}" \
2829
com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \
2930
com.redhat.component="httpd-24-container" \
3031
usage="s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ rhel8/httpd-24 sample-server" \
@@ -34,10 +35,10 @@ EXPOSE 8080
3435
EXPOSE 8443
3536

3637
RUN yum -y module enable httpd:$HTTPD_VERSION && \
37-
INSTALL_PKGS="gettext hostname nss_wrapper-libs httpd mod_ssl mod_ldap mod_session mod_security mod_auth_mellon sscg" && \
38-
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
39-
rpm -V $INSTALL_PKGS && \
40-
httpd -v | grep -qe "Apache/$HTTPD_VERSION" && echo "Found VERSION $HTTPD_VERSION" && \
38+
INSTALL_PKGS="gettext hostname nss_wrapper-libs httpd mod_ssl mod_ldap mod_session mod_security mod_auth_mellon sscg" && \
39+
yum install -y --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
40+
rpm -V ${INSTALL_PKGS} && \
41+
httpd -v | grep -qe "Apache/${HTTPD_VERSION}" && echo "Found VERSION ${HTTPD_VERSION}" && \
4142
yum -y clean all --enablerepo='*'
4243

4344
ENV HTTPD_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/httpd/ \
@@ -52,8 +53,8 @@ ENV HTTPD_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/httpd/ \
5253
HTTPD_DATA_ORIG_PATH=/var/www \
5354
HTTPD_LOG_PATH=/var/log/httpd
5455

55-
COPY 2.4/s2i/bin/ $STI_SCRIPTS_PATH
56-
COPY 2.4/root /
56+
COPY ${HTTPD_VERSION}/s2i/bin/ ${STI_SCRIPTS_PATH}
57+
COPY ${HTTPD_VERSION}/root /
5758

5859
# Reset permissions of filesystem to default values
5960
RUN /usr/libexec/httpd-prepare && rpm-file-permissions

‎2.4/Dockerfile.rhel9‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ FROM ubi9/s2i-core:1
1111
ENV HTTPD_VERSION=2.4 \
1212
HTTPD_SHORT_VERSION=24 \
1313
NAME=httpd
14-
1514
ENV SUMMARY="Platform for running Apache httpd ${HTTPD_VERSION} or building httpd-based application" \
1615
DESCRIPTION="Apache httpd ${HTTPD_VERSION} available as container, is a powerful, efficient, \
1716
and extensible web server. Apache supports a variety of features, many implemented as compiled modules \
@@ -26,7 +25,7 @@ LABEL summary="${SUMMARY}" \
2625
io.openshift.expose-services="8080:http,8443:https" \
2726
io.openshift.tags="builder,${NAME},${NAME}-${HTTPD_SHORT_VERSION}" \
2827
name="rhel9/${NAME}-${HTTPD_SHORT_VERSION}" \
29-
version="1" \
28+
version="${HTTPD_VERSION}" \
3029
com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \
3130
com.redhat.component="${NAME}-${HTTPD_SHORT_VERSION}-container" \
3231
usage="s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ rhel9/${NAME}-${HTTPD_SHORT_VERSION} sample-server" \

‎2.4/root‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../src/root

‎2.4/root/usr/bin/run-httpd‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎2.4/root/usr/libexec/httpd-prepare‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)