-
Notifications
You must be signed in to change notification settings - Fork 125
Enhancements #249
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Enhancements #249
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
b40816a
[syntax enhancement] Change writing style of variables for better rea…
FaramosCZ dd71cc3
[syntax enhancement] Utilize the ${NAME} variable through the contain…
FaramosCZ 03c547e
[syntax enhancement] Utilize the HTTPD_VERSION and HTTPD_SHORT_VERSIO…
FaramosCZ bea13f3
[licensing] Correct the license specification
FaramosCZ 2f90df0
[obsolete code cleanup] Remove 'rpm -V' calls
FaramosCZ 6879a3a
[enhancement] Rebase the base image to Fedora 42
FaramosCZ File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,8 +2,8 @@ FROM quay.io/centos/centos:stream10-development AS build | |
|
|
||
| RUN mkdir -p /mnt/rootfs | ||
| RUN MICRO_PKGS="coreutils-single glibc-minimal-langpack" && \ | ||
| INSTALL_PKGS="$MICRO_PKGS httpd-core mod_ssl findutils hostname nss_wrapper-libs redhat-logos-httpd" && \ | ||
| dnf install --installroot /mnt/rootfs $INSTALL_PKGS --releasever 9 --setopt install_weak_deps=false --nodocs -y && \ | ||
| INSTALL_PKGS="${MICRO_PKGS} httpd-core mod_ssl findutils hostname nss_wrapper-libs redhat-logos-httpd" && \ | ||
| dnf install --installroot /mnt/rootfs ${INSTALL_PKGS} --releasever 9 --setopt install_weak_deps=false --nodocs -y && \ | ||
| dnf -y --installroot /mnt/rootfs clean all && \ | ||
| rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.* | ||
|
|
||
|
|
@@ -20,8 +20,8 @@ ENV HTTPD_VERSION=2.4 \ | |
| HTTPD_SHORT_VERSION=24 \ | ||
| NAME=httpd | ||
|
|
||
| ENV SUMMARY="Platform for running Apache httpd $HTTPD_VERSION or building httpd-based application" \ | ||
| DESCRIPTION="Apache httpd $HTTPD_VERSION available as container, is a powerful, efficient, \ | ||
| ENV SUMMARY="Platform for running Apache httpd ${HTTPD_VERSION} or building httpd-based application" \ | ||
| DESCRIPTION="Apache httpd ${HTTPD_VERSION} available as container, is a powerful, efficient, \ | ||
| and extensible web server. Apache supports a variety of features, many implemented as compiled modules \ | ||
| which extend the core functionality. \ | ||
| These can range from server-side programming language support to authentication schemes. \ | ||
|
|
@@ -32,15 +32,15 @@ Virtual hosting allows one Apache installation to serve many different Web sites | |
| HOME=/opt/app-root/src \ | ||
| PLATFORM="el10" | ||
|
|
||
| LABEL summary="$SUMMARY" \ | ||
| description="$DESCRIPTION" \ | ||
| io.k8s.description="$DESCRIPTION" \ | ||
| io.k8s.display-name="Apache httpd $HTTPD_VERSION" \ | ||
| LABEL summary="${SUMMARY}" \ | ||
| description="${DESCRIPTION}" \ | ||
| io.k8s.description="${DESCRIPTION}" \ | ||
| io.k8s.display-name="Apache httpd ${HTTPD_VERSION}" \ | ||
| io.openshift.expose-services="8080:http,8443:https" \ | ||
| io.openshift.tags="builder,httpd,httpd-$HTTPD_SHORT_VERSION" \ | ||
| name="sclorg/$NAME-$HTTPD_SHORT_VERSION-micro-c10s" \ | ||
| io.openshift.tags="builder,${NAME},${NAME}-${HTTPD_SHORT_VERSION}" \ | ||
| name="sclorg/${NAME}-${HTTPD_SHORT_VERSION}-micro-c10s" \ | ||
| version="1" \ | ||
| usage="s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ sclorg/$NAME-$HTTPD_SHORT_VERSION-micro-c10s sample-server" \ | ||
| usage="s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ sclorg/${NAME}-${HTTPD_SHORT_VERSION}-micro-c10s sample-server" \ | ||
| maintainer="SoftwareCollections.org <[email protected]>" | ||
|
|
||
| EXPOSE 8080 | ||
|
|
@@ -60,16 +60,16 @@ ENV HTTPD_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/httpd/ \ | |
| HTTPD_DATA_ORIG_PATH=/var/www \ | ||
| HTTPD_LOG_PATH=/var/log/httpd | ||
|
|
||
| COPY 2.4-micro/s2i/bin/ $STI_SCRIPTS_PATH | ||
| COPY 2.4-micro/root / | ||
| COPY 2.4-micro/core-scripts/usr /usr | ||
| COPY ${HTTPD_VERSION}-micro/s2i/bin/ ${STI_SCRIPTS_PATH} | ||
| COPY ${HTTPD_VERSION}-micro/root / | ||
| COPY ${HTTPD_VERSION}-micro/core-scripts/usr /usr | ||
|
|
||
| WORKDIR ${HOME} | ||
|
|
||
| # Add default user and prepare httpd | ||
| RUN useradd -u 1001 -r -g 0 -d ${HOME} -c "Default Application User" default && \ | ||
| chown -R 1001:0 ${APP_ROOT} && \ | ||
| httpd -v | grep -qe "Apache/$HTTPD_VERSION" && echo "Found VERSION $HTTPD_VERSION" && \ | ||
| httpd -v | grep -qe "Apache/${HTTPD_VERSION}" && echo "Found VERSION ${HTTPD_VERSION}" && \ | ||
| /usr/libexec/httpd-prepare | ||
|
|
||
| USER 1001 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,8 +2,8 @@ FROM quay.io/centos/centos:stream9 AS build | |
|
|
||
| RUN mkdir -p /mnt/rootfs | ||
| RUN MICRO_PKGS="coreutils-single glibc-minimal-langpack" && \ | ||
| INSTALL_PKGS="$MICRO_PKGS httpd-core mod_ssl findutils hostname nss_wrapper-libs redhat-logos-httpd" && \ | ||
| dnf install --installroot /mnt/rootfs $INSTALL_PKGS --releasever 9 --setopt install_weak_deps=false --nodocs -y && \ | ||
| INSTALL_PKGS="${MICRO_PKGS} httpd-core mod_ssl findutils hostname nss_wrapper-libs redhat-logos-httpd" && \ | ||
| dnf install --installroot /mnt/rootfs ${INSTALL_PKGS} --releasever 9 --setopt install_weak_deps=false --nodocs -y && \ | ||
| dnf -y --installroot /mnt/rootfs clean all && \ | ||
| rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.* | ||
|
|
||
|
|
@@ -16,10 +16,12 @@ FROM scratch | |
| # Environment: | ||
| # * $HTTPD_LOG_TO_VOLUME (optional) - When set, httpd will log into /var/log/httpd24 | ||
|
|
||
| ENV HTTPD_VERSION=2.4 | ||
| ENV HTTPD_VERSION=2.4 \ | ||
| HTTPD_SHORT_VERSION=24 \ | ||
| NAME=httpd | ||
|
|
||
| ENV SUMMARY="Platform for running Apache httpd $HTTPD_VERSION or building httpd-based application" \ | ||
| DESCRIPTION="Apache httpd $HTTPD_VERSION available as container, is a powerful, efficient, \ | ||
| ENV SUMMARY="Platform for running Apache httpd ${HTTPD_VERSION} or building httpd-based application" \ | ||
| DESCRIPTION="Apache httpd ${HTTPD_VERSION} available as container, is a powerful, efficient, \ | ||
| and extensible web server. Apache supports a variety of features, many implemented as compiled modules \ | ||
| which extend the core functionality. \ | ||
| These can range from server-side programming language support to authentication schemes. \ | ||
|
|
@@ -30,15 +32,15 @@ Virtual hosting allows one Apache installation to serve many different Web sites | |
| HOME=/opt/app-root/src \ | ||
| PLATFORM="el9" | ||
|
|
||
| LABEL summary="$SUMMARY" \ | ||
| description="$DESCRIPTION" \ | ||
| io.k8s.description="$DESCRIPTION" \ | ||
| io.k8s.display-name="Apache httpd $HTTPD_VERSION" \ | ||
| LABEL summary="${SUMMARY}" \ | ||
| description="${DESCRIPTION}" \ | ||
| io.k8s.description="${DESCRIPTION}" \ | ||
| io.k8s.display-name="Apache httpd ${HTTPD_VERSION}" \ | ||
| io.openshift.expose-services="8080:http,8443:https" \ | ||
| io.openshift.tags="builder,httpd,httpd-24" \ | ||
| name="sclorg/httpd-24-micro-c9s" \ | ||
| io.openshift.tags="builder,${NAME},${NAME}-${HTTPD_SHORT_VERSION}" \ | ||
| name="sclorg/${NAME}-${HTTPD_SHORT_VERSION}-micro-c9s" \ | ||
| version="1" \ | ||
| usage="s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ sclorg/httpd-24-micro-c9s sample-server" \ | ||
| usage="s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ sclorg/${NAME}-${HTTPD_SHORT_VERSION}-micro-c9s sample-server" \ | ||
| maintainer="SoftwareCollections.org <[email protected]>" | ||
|
|
||
| EXPOSE 8080 | ||
|
|
@@ -58,16 +60,16 @@ ENV HTTPD_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/httpd/ \ | |
| HTTPD_DATA_ORIG_PATH=/var/www \ | ||
| HTTPD_LOG_PATH=/var/log/httpd | ||
|
|
||
| COPY 2.4-micro/s2i/bin/ $STI_SCRIPTS_PATH | ||
| COPY 2.4-micro/root / | ||
| COPY 2.4-micro/core-scripts/usr /usr | ||
| COPY ${HTTPD_VERSION}-micro/s2i/bin/ ${STI_SCRIPTS_PATH} | ||
| COPY ${HTTPD_VERSION}-micro/root / | ||
| COPY ${HTTPD_VERSION}-micro/core-scripts/usr /usr | ||
|
|
||
| WORKDIR ${HOME} | ||
|
|
||
| # Add default user and prepare httpd | ||
| RUN useradd -u 1001 -r -g 0 -d ${HOME} -c "Default Application User" default && \ | ||
| chown -R 1001:0 ${APP_ROOT} && \ | ||
| httpd -v | grep -qe "Apache/$HTTPD_VERSION" && echo "Found VERSION $HTTPD_VERSION" && \ | ||
| httpd -v | grep -qe "Apache/${HTTPD_VERSION}" && echo "Found VERSION ${HTTPD_VERSION}" && \ | ||
| /usr/libexec/httpd-prepare | ||
|
|
||
| USER 1001 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| FROM quay.io/fedora/fedora:38 AS build | ||
| FROM quay.io/fedora/fedora:42 AS build | ||
|
|
||
| RUN mkdir -p /mnt/rootfs | ||
| RUN MICRO_PKGS="coreutils-single glibc-minimal-langpack" && \ | ||
| INSTALL_PKGS="$MICRO_PKGS httpd-core mod_ssl findutils hostname nss_wrapper-libs fedora-logos-httpd" && \ | ||
| dnf install --installroot /mnt/rootfs $INSTALL_PKGS --releasever 38 --setopt install_weak_deps=false --nodocs -y && \ | ||
| INSTALL_PKGS="${MICRO_PKGS} httpd-core mod_ssl findutils hostname nss_wrapper-libs fedora-logos-httpd" && \ | ||
| dnf install --installroot /mnt/rootfs ${INSTALL_PKGS} --releasever 42 --use-host-config --setopt install_weak_deps=false --nodocs -y && \ | ||
| dnf -y --installroot /mnt/rootfs clean all && \ | ||
| rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.* | ||
|
|
||
|
|
@@ -16,10 +16,12 @@ FROM scratch | |
| # Environment: | ||
| # * $HTTPD_LOG_TO_VOLUME (optional) - When set, httpd will log into /var/log/httpd24 | ||
|
|
||
| ENV HTTPD_VERSION=2.4 | ||
| ENV HTTPD_VERSION=2.4 \ | ||
| HTTPD_SHORT_VERSION=24 \ | ||
| NAME=httpd | ||
|
|
||
| ENV SUMMARY="Platform for running Apache httpd $HTTPD_VERSION or building httpd-based application" \ | ||
| DESCRIPTION="Apache httpd $HTTPD_VERSION available as container, is a powerful, efficient, \ | ||
| ENV SUMMARY="Platform for running Apache httpd ${HTTPD_VERSION} or building httpd-based application" \ | ||
| DESCRIPTION="Apache httpd ${HTTPD_VERSION} available as container, is a powerful, efficient, \ | ||
| and extensible web server. Apache supports a variety of features, many implemented as compiled modules \ | ||
| which extend the core functionality. \ | ||
| These can range from server-side programming language support to authentication schemes. \ | ||
|
|
@@ -30,15 +32,15 @@ Virtual hosting allows one Apache installation to serve many different Web sites | |
| HOME=/opt/app-root/src \ | ||
| PLATFORM="fedora" | ||
|
|
||
| LABEL summary="$SUMMARY" \ | ||
| description="$DESCRIPTION" \ | ||
| io.k8s.description="$DESCRIPTION" \ | ||
| io.k8s.display-name="Apache httpd $HTTPD_VERSION" \ | ||
| LABEL summary="${SUMMARY}" \ | ||
| description="${DESCRIPTION}" \ | ||
| io.k8s.description="${DESCRIPTION}" \ | ||
| io.k8s.display-name="Apache httpd ${HTTPD_VERSION}" \ | ||
| io.openshift.expose-services="8080:http,8443:https" \ | ||
| io.openshift.tags="builder,httpd,httpd-24" \ | ||
| name="fedora/httpd-24-micro" \ | ||
| io.openshift.tags="builder,${NAME},${NAME}-${HTTPD_SHORT_VERSION}" \ | ||
| name="fedora/${NAME}-${HTTPD_SHORT_VERSION}-micro" \ | ||
| version="1" \ | ||
| usage="s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ fedora/httpd-24-micro sample-server" \ | ||
| usage="s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ fedora/${NAME}-${HTTPD_SHORT_VERSION}-micro sample-server" \ | ||
| maintainer="SoftwareCollections.org <[email protected]>" | ||
|
|
||
| EXPOSE 8080 | ||
|
|
@@ -58,16 +60,16 @@ ENV HTTPD_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/httpd/ \ | |
| HTTPD_DATA_ORIG_PATH=/var/www \ | ||
| HTTPD_LOG_PATH=/var/log/httpd | ||
|
|
||
| COPY 2.4-micro/s2i/bin/ $STI_SCRIPTS_PATH | ||
| COPY 2.4-micro/root / | ||
| COPY 2.4-micro/core-scripts/usr /usr | ||
| COPY ${HTTPD_VERSION}-micro/s2i/bin/ ${STI_SCRIPTS_PATH} | ||
| COPY ${HTTPD_VERSION}-micro/root / | ||
| COPY ${HTTPD_VERSION}-micro/core-scripts/usr /usr | ||
|
|
||
| WORKDIR ${HOME} | ||
|
|
||
| # Add default user and prepare httpd | ||
| RUN useradd -u 1001 -r -g 0 -d ${HOME} -c "Default Application User" default && \ | ||
| chown -R 1001:0 ${APP_ROOT} && \ | ||
| httpd -v | grep -qe "Apache/$HTTPD_VERSION" && echo "Found VERSION $HTTPD_VERSION" && \ | ||
| httpd -v | grep -qe "Apache/${HTTPD_VERSION}" && echo "Found VERSION ${HTTPD_VERSION}" && \ | ||
| /usr/libexec/httpd-prepare | ||
|
|
||
| USER 1001 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,33 +13,32 @@ ENV HTTPD_VERSION=2.4 \ | |
| NAME=httpd \ | ||
| ARCH=x86_64 | ||
|
|
||
| ENV SUMMARY="Platform for running Apache httpd $HTTPD_VERSION or building httpd-based application" \ | ||
| DESCRIPTION="Apache httpd $HTTPD_VERSION available as container, is a powerful, efficient, \ | ||
| ENV SUMMARY="Platform for running Apache httpd ${HTTPD_VERSION} or building httpd-based application" \ | ||
| DESCRIPTION="Apache httpd ${HTTPD_VERSION} available as container, is a powerful, efficient, \ | ||
| and extensible web server. Apache supports a variety of features, many implemented as compiled modules \ | ||
| which extend the core functionality. \ | ||
| These can range from server-side programming language support to authentication schemes. \ | ||
| Virtual hosting allows one Apache installation to serve many different Web sites." | ||
|
|
||
| LABEL summary="$SUMMARY" \ | ||
| description="$DESCRIPTION" \ | ||
| io.k8s.description="$DESCRIPTION" \ | ||
| io.k8s.display-name="Apache httpd $HTTPD_VERSION" \ | ||
| LABEL summary="${SUMMARY}" \ | ||
| description="${DESCRIPTION}" \ | ||
| io.k8s.description="${DESCRIPTION}" \ | ||
| io.k8s.display-name="Apache httpd ${HTTPD_VERSION}" \ | ||
| io.openshift.expose-services="8080:http,8443:https" \ | ||
| io.openshift.tags="builder,$NAME,$NAME-$HTTPD_SHORT_VERSION" \ | ||
| name="sclorg/$NAME-$HTTPD_SHORT_VERSION-c10s" \ | ||
| io.openshift.tags="builder,${NAME},${NAME}-${HTTPD_SHORT_VERSION}" \ | ||
| name="sclorg/${NAME}-${HTTPD_SHORT_VERSION}-c10s" \ | ||
| version="1" \ | ||
| com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \ | ||
| com.redhat.component="httpd-24-container" \ | ||
| 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" \ | ||
| com.redhat.component="${NAME}-${HTTPD_SHORT_VERSION}-container" \ | ||
| 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" \ | ||
| maintainer="SoftwareCollections.org <[email protected]>" | ||
|
|
||
| EXPOSE 8080 | ||
| EXPOSE 8443 | ||
|
|
||
| RUN INSTALL_PKGS="gettext hostname nss_wrapper-libs bind-utils httpd mod_ssl mod_ldap mod_session sscg" && \ | ||
| dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ | ||
| rpm -V $INSTALL_PKGS && \ | ||
| httpd -v | grep -qe "Apache/$HTTPD_VERSION" && echo "Found VERSION $HTTPD_VERSION" && \ | ||
| dnf install -y --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ | ||
| httpd -v | grep -qe "Apache/${HTTPD_VERSION}" && echo "Found VERSION ${HTTPD_VERSION}" && \ | ||
| dnf -y clean all --enablerepo='*' | ||
|
|
||
| ENV HTTPD_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/httpd/ \ | ||
|
|
@@ -54,8 +53,8 @@ ENV HTTPD_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/httpd/ \ | |
| HTTPD_DATA_ORIG_PATH=/var/www \ | ||
| HTTPD_LOG_PATH=/var/log/httpd | ||
|
|
||
| COPY 2.4/s2i/bin/ $STI_SCRIPTS_PATH | ||
| COPY 2.4/root / | ||
| COPY ${HTTPD_VERSION}/s2i/bin/ ${STI_SCRIPTS_PATH} | ||
| COPY ${HTTPD_VERSION}/root / | ||
|
|
||
| # Reset permissions of filesystem to default values | ||
| RUN /usr/libexec/httpd-prepare && rpm-file-permissions | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,35 +8,36 @@ FROM quay.io/sclorg/s2i-core-c9s:c9s | |
| # Environment: | ||
| # * $HTTPD_LOG_TO_VOLUME (optional) - When set, httpd will log into /var/log/httpd24 | ||
|
|
||
| ENV HTTPD_VERSION=2.4 | ||
| ENV HTTPD_VERSION=2.4 \ | ||
| HTTPD_SHORT_VERSION=24 \ | ||
| NAME=httpd | ||
|
|
||
| ENV SUMMARY="Platform for running Apache httpd $HTTPD_VERSION or building httpd-based application" \ | ||
| DESCRIPTION="Apache httpd $HTTPD_VERSION available as container, is a powerful, efficient, \ | ||
| ENV SUMMARY="Platform for running Apache httpd ${HTTPD_VERSION} or building httpd-based application" \ | ||
| DESCRIPTION="Apache httpd ${HTTPD_VERSION} available as container, is a powerful, efficient, \ | ||
| and extensible web server. Apache supports a variety of features, many implemented as compiled modules \ | ||
| which extend the core functionality. \ | ||
| These can range from server-side programming language support to authentication schemes. \ | ||
| Virtual hosting allows one Apache installation to serve many different Web sites." | ||
|
|
||
| LABEL summary="$SUMMARY" \ | ||
| description="$DESCRIPTION" \ | ||
| io.k8s.description="$DESCRIPTION" \ | ||
| io.k8s.display-name="Apache httpd $HTTPD_VERSION" \ | ||
| LABEL summary="${SUMMARY}" \ | ||
| description="${DESCRIPTION}" \ | ||
| io.k8s.description="${DESCRIPTION}" \ | ||
| io.k8s.display-name="Apache httpd ${HTTPD_VERSION}" \ | ||
| io.openshift.expose-services="8080:http,8443:https" \ | ||
| io.openshift.tags="builder,httpd,httpd-24" \ | ||
| name="sclorg/httpd-24-c9s" \ | ||
| io.openshift.tags="builder,${NAME},${NAME}-${HTTPD_SHORT_VERSION}" \ | ||
| name="sclorg/${NAME}-${HTTPD_SHORT_VERSION}-c9s" \ | ||
| version="1" \ | ||
| com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#rhel" \ | ||
| com.redhat.component="httpd-24-container" \ | ||
| usage="s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ quay.io/sclorg/httpd-24-c9s sample-server" \ | ||
| com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \ | ||
| com.redhat.component="${NAME}-${HTTPD_SHORT_VERSION}-container" \ | ||
| 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" \ | ||
| maintainer="SoftwareCollections.org <[email protected]>" | ||
|
|
||
| EXPOSE 8080 | ||
| EXPOSE 8443 | ||
|
|
||
| RUN INSTALL_PKGS="gettext hostname nss_wrapper-libs bind-utils httpd mod_ssl mod_ldap mod_session mod_security mod_auth_mellon sscg" && \ | ||
| yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ | ||
| rpm -V $INSTALL_PKGS && \ | ||
| httpd -v | grep -qe "Apache/$HTTPD_VERSION" && echo "Found VERSION $HTTPD_VERSION" && \ | ||
| yum install -y --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ | ||
| httpd -v | grep -qe "Apache/${HTTPD_VERSION}" && echo "Found VERSION ${HTTPD_VERSION}" && \ | ||
| yum -y clean all --enablerepo='*' | ||
|
|
||
| ENV HTTPD_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/httpd/ \ | ||
|
|
@@ -51,8 +52,8 @@ ENV HTTPD_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/httpd/ \ | |
| HTTPD_DATA_ORIG_PATH=/var/www \ | ||
| HTTPD_LOG_PATH=/var/log/httpd | ||
|
|
||
| COPY 2.4/s2i/bin/ $STI_SCRIPTS_PATH | ||
| COPY 2.4/root / | ||
| COPY ${HTTPD_VERSION}/s2i/bin/ ${STI_SCRIPTS_PATH} | ||
| COPY ${HTTPD_VERSION}/root / | ||
|
|
||
| # Reset permissions of filesystem to default values | ||
| RUN /usr/libexec/httpd-prepare && rpm-file-permissions | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.