public_git
/
bitnami-containers
mirror of https://github.com/bitnami/containers.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

2.4.39-debian-9-r40 release

This commit is contained in:
Bitnami Bot 2019-05-30 09:17:48 +00:00
parent cf48f8022b
commit acef56cb7c
8 changed files with 43 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bitnami/apache/2.4/debian-9/Dockerfile
View File

@ -2,27 +2,30 @@ FROM bitnami/minideb-extras:stretch-r375
LABEL maintainer "Bitnami <containers@bitnami.com>"
ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
BITNAMI_PKG_EXTRA_DIRS="/bitnami/apache/conf /opt/bitnami/apache/tmp /opt/bitnami/apache/conf" \
HOME="/"
# Install required system packages and dependencies
RUN install_packages libc6 libexpat1 libffi6 libgmp10 libgnutls30 libhogweed4 libidn11 libldap-2.4-2 libnettle6 libnghttp2-14 libp11-kit0 libpcre3 libsasl2-2 libssl1.1 libtasn1-6 zlib1g
RUN bitnami-pkg unpack apache-2.4.39-1 --checksum 8b191adc55155e604cc224309a0179585f898dff83a470272d5fa5cbefc4c17e
RUN ln -sf /opt/bitnami/apache/htdocs /app
RUN bitnami-pkg unpack apache-2.4.39-2 --checksum ff55ee9cccf484bac61fa91558fc7f8445e91ea00bb104aca216f08aea003c6b
RUN ln -sf /dev/stdout /opt/bitnami/apache/logs/access_log
RUN ln -sf /dev/stderr /opt/bitnami/apache/logs/error_log
RUN chmod -R g+rwX /opt/bitnami/apache/tmp /opt/bitnami/apache/conf
COPY rootfs /
ENV APACHE_HTTPS_PORT_NUMBER="8443" \
APACHE_HTTP_PORT_NUMBER="8080" \
APACHE_SET_HTTPS_PORT="no" \
APACHE_SET_HTTP_PORT="no" \
BITNAMI_APP_NAME="apache" \
BITNAMI_IMAGE_VERSION="2.4.39-debian-9-r39" \
BITNAMI_IMAGE_VERSION="2.4.39-debian-9-r40" \
NAMI_PREFIX="/.nami" \
PATH="/opt/bitnami/apache/bin:$PATH"
VOLUME [ "/certs", "/app" ]
EXPOSE 8080 8443
WORKDIR /app
USER 1001
ENTRYPOINT [ "/app-entrypoint.sh" ]
CMD [ "/run.sh" ]
CMD [ "httpd", "-f", "/opt/bitnami/apache/conf/httpd.conf", "-DFOREGROUND" ]

5
bitnami/apache/2.4/debian-9/docker-compose.yml
View File

@ -6,8 +6,3 @@ services:
ports:
- '80:8080'
- '443:8443'
volumes:
- 'apache_data:/bitnami'
volumes:
apache_data:
driver: local

28
bitnami/apache/2.4/debian-9/rootfs/apache-init.sh Normal file
View File

@ -0,0 +1,28 @@
#!/bin/bash
# Check whether Apache ports must be configured
if [[ -n "${APACHE_HTTP_PORT_NUMBER:-}" ]]; then
export APACHE_SET_HTTP_PORT="yes"
fi
if [[ -n "${APACHE_HTTPS_PORT_NUMBER:-}" ]]; then
export APACHE_SET_HTTPS_PORT="yes"
fi
# Mount certificate files
if [[ -d "/opt/bitnami/apache/certs" ]]; then
warn "The directory '/opt/bitnami/apache/certs' was externally mounted. This is a legacy configuration and will be deprecated soon. Please mount certificate files at '/opt/bitnami/apache/conf/bitnami/certs' instead. Find an example at: https://github.com/bitnami/bitnami-docker-apache#using-custom-ssl-certificates"
warn "Restoring certificates at '/opt/bitnami/apache/certs' to '/opt/bitnami/apache/conf/bitnami/certs'..."
rm -rf /opt/bitnami/apache/conf/bitnami/certs
ln -sf /opt/bitnami/apache/certs /opt/bitnami/apache/conf/bitnami/certs
elif [ "$(ls -A /certs 2>/dev/null)" ]; then
info "Mounting certificates files from /certs..."
rm -rf /opt/bitnami/apache/conf/bitnami/certs
ln -sf /certs /opt/bitnami/apache/conf/bitnami/certs
fi
# Mount application files
if [ "$(ls -A /app 2>/dev/null)" ]; then
info "Mounting application files from /app..."
rm -rf /opt/bitnami/apache/htdocs
ln -sf /app /opt/bitnami/apache/htdocs
fi

4
bitnami/apache/2.4/debian-9/rootfs/apache-inputs.json
View File

@ -1,4 +1,6 @@
{
"httpPort": "{{$global.env.APACHE_HTTP_PORT_NUMBER}}",
"httpsPort": "{{$global.env.APACHE_HTTPS_PORT_NUMBER}}"
"httpsPort": "{{$global.env.APACHE_HTTPS_PORT_NUMBER}}",
"setHttpPort": "{{$global.env.APACHE_SET_HTTP_PORT}}",
"setHttpsPort": "{{$global.env.APACHE_SET_HTTPS_PORT}}"
}

3
bitnami/apache/2.4/debian-9/rootfs/app-entrypoint.sh
View File

@ -5,7 +5,8 @@
print_welcome_page
if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/run.sh" ]]; then
if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "httpd" ]]; then
. /apache-init.sh
nami_initialize apache
info "Starting apache... "
fi

12
bitnami/apache/2.4/debian-9/rootfs/run.sh
View File

@ -1,12 +0,0 @@
#!/bin/bash
. /opt/bitnami/base/functions
. /opt/bitnami/base/helpers
DAEMON=httpd
EXEC=$(which "$DAEMON")
ARGS="-f /opt/bitnami/apache/conf/httpd.conf -D FOREGROUND"
info "Starting ${DAEMON}..."
exec ${EXEC} ${ARGS}

4
bitnami/apache/README.md
View File

@ -48,8 +48,8 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
* [`2.4-rhel-7`, `2.4.39-rhel-7-r14` (2.4/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.39-rhel-7-r14/2.4/rhel-7/Dockerfile)
* [`2.4-ol-7`, `2.4.39-ol-7-r50` (2.4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.39-ol-7-r50/2.4/ol-7/Dockerfile)
* [`2.4-debian-9`, `2.4.39-debian-9-r39`, `2.4`, `2.4.39`, `2.4.39-r39`, `latest` (2.4/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.39-debian-9-r39/2.4/debian-9/Dockerfile)
* [`2.4-ol-7`, `2.4.39-ol-7-r49` (2.4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.39-ol-7-r49/2.4/ol-7/Dockerfile)
* [`2.4-debian-9`, `2.4.39-debian-9-r40`, `2.4`, `2.4.39`, `2.4.39-r40`, `latest` (2.4/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.39-debian-9-r40/2.4/debian-9/Dockerfile)
# Get this image

5
bitnami/apache/docker-compose.yml
View File

@ -6,8 +6,3 @@ services:
ports:
- '80:8080'
- '443:8443'
volumes:
- 'apache_data:/bitnami'
volumes:
apache_data:
driver: local