From 1668799ffaca904cc93f7002da55fde59bee0718 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 19 Jan 2024 18:26:33 +0100 Subject: [PATCH] [bitnami/apache] Release 2.4.58-debian-11-r5 (#54924) Signed-off-by: Bitnami Containers --- bitnami/apache/2.4/debian-11/Dockerfile | 7 +-- .../opt/bitnami/.bitnami_components.json | 2 +- bitnami/apache/README.md | 46 ++++++++++++++----- 3 files changed, 39 insertions(+), 16 deletions(-) diff --git a/bitnami/apache/2.4/debian-11/Dockerfile b/bitnami/apache/2.4/debian-11/Dockerfile index 1a10cab5bbbb..7d8ef6da84e9 100644 --- a/bitnami/apache/2.4/debian-11/Dockerfile +++ b/bitnami/apache/2.4/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2024-01-06T09:01:07Z" \ + org.opencontainers.image.created="2024-01-19T16:27:41Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.4.58-debian-11-r4" \ + org.opencontainers.image.ref.name="2.4.58-debian-11-r5" \ org.opencontainers.image.title="apache" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.4.58" @@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libcrypt1 libexpat1 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblzma5 libnettle8 libnghttp2-14 libp11-kit0 libpcre3 libsasl2-2 libssl1.1 libstdc++6 libtasn1-6 libunistring2 libxml2 openssl procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-5-linux-${OS_ARCH}-debian-11" \ "apache-2.4.58-2-linux-${OS_ARCH}-debian-11" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ @@ -42,6 +42,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami +RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true COPY rootfs / RUN /opt/bitnami/scripts/apache/postunpack.sh diff --git a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 853be1742fef..dd5718ab6ee3 100644 --- a/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/apache/2.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -9,6 +9,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-4" + "version": "1.0.6-5" } } \ No newline at end of file diff --git a/bitnami/apache/README.md b/bitnami/apache/README.md index b6b17353dd29..98c09eaa6d6a 100644 --- a/bitnami/apache/README.md +++ b/bitnami/apache/README.md @@ -13,13 +13,6 @@ Trademarks: This software listing is packaged by Bitnami. The respective tradema docker run --name apache bitnami/apache:latest ``` -### Docker Compose - -```console -curl -sSL https://raw.githubusercontent.com/bitnami/containers/main/bitnami/apache/docker-compose.yml > docker-compose.yml -docker-compose up -d -``` - You can find the available configuration options in the [Environment Variables](#environment-variables) section. ## Why use Bitnami Images? @@ -126,6 +119,34 @@ Access your web server in the browser by navigating to `http://localhost:8080/`. ### Environment variables +#### Customizable environment variables + +| Name | Description | Default Value | +|------------------------|--------------------------------|---------------| +| `APACHE_SERVER_TOKENS` | Apache ServerTokens directive. | `Prod` | + +#### Read-only environment variables + +| Name | Description | Value | +|------------------------------------|-----------------------------------------------------------|---------------------------------| +| `WEB_SERVER_TYPE` | Web server type | `apache` | +| `APACHE_BASE_DIR` | Apache installation directory. | `${BITNAMI_ROOT_DIR}/apache` | +| `APACHE_BIN_DIR` | Apache directory for binary executables. | `${APACHE_BASE_DIR}/bin` | +| `APACHE_CONF_DIR` | Apache configuration directory. | `${APACHE_BASE_DIR}/conf` | +| `APACHE_HTDOCS_DIR` | Directory containing HTTP files to serve via Apache. | `${APACHE_BASE_DIR}/htdocs` | +| `APACHE_TMP_DIR` | Apache directory for runtime temporary files. | `${APACHE_BASE_DIR}/var/run` | +| `APACHE_LOGS_DIR` | Apache directory for logs. | `${APACHE_BASE_DIR}/logs` | +| `APACHE_VHOSTS_DIR` | Apache directory for virtual hosts. | `${APACHE_CONF_DIR}/vhosts` | +| `APACHE_HTACCESS_DIR` | Apache directory for htaccess files. | `${APACHE_VHOSTS_DIR}/htaccess` | +| `APACHE_CONF_FILE` | Path to the Apache configuration. | `${APACHE_CONF_DIR}/httpd.conf` | +| `APACHE_PID_FILE` | Path to the Apache PID file. | `${APACHE_TMP_DIR}/httpd.pid` | +| `APACHE_DAEMON_USER` | Apache system user. | `daemon` | +| `APACHE_DAEMON_GROUP` | Apache system group. | `daemon` | +| `APACHE_DEFAULT_HTTP_PORT_NUMBER` | Default Apache HTTP port number to enable at build time. | `8080` | +| `APACHE_DEFAULT_HTTP_PORT_NUMBER` | Default Apache HTTP port number to enable at build time. | `80` | +| `APACHE_DEFAULT_HTTPS_PORT_NUMBER` | Default Apache HTTPS port number to enable at build time. | `8443` | +| `APACHE_DEFAULT_HTTPS_PORT_NUMBER` | Default Apache HTTPS port number to enable at build time. | `443` | + When you start the Apache image, you can adjust the configuration of the instance by passing one or more environment variables either on the docker-compose file or on the `docker run` command line. If you want to add a new environment variable: * For docker-compose add the variable name and value under the application section: @@ -152,11 +173,6 @@ docker run -d --name apache -p 80:8081 -p 443:443 \ bitnami/apache:latest ``` -Available variables: - -* `APACHE_HTTP_PORT_NUMBER`: Port used by Apache for HTTP. Default: **8080** -* `APACHE_HTTPS_PORT_NUMBER`: Port used by Apache for HTTPS. Default: **8443** - ### Adding custom virtual hosts The default `httpd.conf` includes virtual hosts placed in `/opt/bitnami/apache/conf/vhosts/`. You can mount a `my_vhost.conf` file containing your custom virtual hosts at the `/vhosts` folder. @@ -492,6 +508,12 @@ docker-compose up apache * The `/app` directory is no longer exported as a volume. This caused problems when building on top of the image, since changes in the volume are not persisted between Dockerfile `RUN` instructions. To keep the previous behavior (so that you can mount the volume in another container), create the container with the `-v /app` option. +## Using `docker-compose.yaml` + +Please be aware this file has not undergone internal testing. Consequently, we advise its use exclusively for development or testing purposes. For production-ready deployments, we highly recommend utilizing its associated [Bitnami Helm chart](https://github.com/bitnami/charts/tree/main/bitnami/apache). + +If you detect any issue in the `docker-compose.yaml` file, feel free to report it or contribute with a fix by following our [Contributing Guidelines](https://github.com/bitnami/containers/blob/main/CONTRIBUTING.md). + ## Contributing We'd love for you to contribute to this container. You can request new features by creating an [issue](https://github.com/bitnami/containers/issues) or submitting a [pull request](https://github.com/bitnami/containers/pulls) with your contribution.