From 4f3d53280148867a2e9746892d885a49de85dc39 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Sat, 30 Jul 2022 10:28:11 +0200 Subject: [PATCH] [bitnami/apache] Release 2.4.54-debian-11-r18 (#1240) Signed-off-by: Bitnami Containers --- .../opt/bitnami/scripts/apache/setup.sh | 4 ++-- bitnami/apache/README.md | 22 ++++++++----------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/bitnami/apache/2.4/debian-11/rootfs/opt/bitnami/scripts/apache/setup.sh b/bitnami/apache/2.4/debian-11/rootfs/opt/bitnami/scripts/apache/setup.sh index 3d7279aad46a..6fc139a94f2f 100755 --- a/bitnami/apache/2.4/debian-11/rootfs/opt/bitnami/scripts/apache/setup.sh +++ b/bitnami/apache/2.4/debian-11/rootfs/opt/bitnami/scripts/apache/setup.sh @@ -27,7 +27,7 @@ fi # Mount certificate files if ! is_dir_empty "${APACHE_BASE_DIR}/certs"; then - warn "The directory '${APACHE_BASE_DIR}/certs' was externally mounted. This is a legacy configuration and will be deprecated soon. Please mount certificate files at '/certs' instead. Find an example at: https://github.com/bitnami/bitnami-docker-apache#using-custom-ssl-certificates" + warn "The directory '${APACHE_BASE_DIR}/certs' was externally mounted. This is a legacy configuration and will be deprecated soon. Please mount certificate files at '/certs' instead. Find an example at: https://github.com/bitnami/containers/tree/main/bitnami/apache#using-custom-ssl-certificates" warn "Restoring certificates at '${APACHE_BASE_DIR}/certs' to '${APACHE_CONF_DIR}/bitnami/certs'" rm -rf "${APACHE_CONF_DIR}/bitnami/certs" ln -sf "${APACHE_BASE_DIR}/certs" "${APACHE_CONF_DIR}/bitnami/certs" @@ -46,7 +46,7 @@ fi # Restore persisted configuration files (deprecated) if ! is_dir_empty "/bitnami/apache/conf"; then - warn "The directory '/bitnami/apache/conf' was externally mounted. This is a legacy configuration and will be deprecated soon. Please mount certificate files at '${APACHE_CONF_DIR}' instead. Find an example at: https://github.com/bitnami/bitnami-docker-apache#full-configuration" + warn "The directory '/bitnami/apache/conf' was externally mounted. This is a legacy configuration and will be deprecated soon. Please mount certificate files at '${APACHE_CONF_DIR}' instead. Find an example at: https://github.com/bitnami/containers/tree/main/bitnami/apache#full-configuration" warn "Restoring configuration at '/bitnami/apache/conf' to '${APACHE_CONF_DIR}'" rm -rf "$APACHE_CONF_DIR" ln -sf "/bitnami/apache/conf" "$APACHE_CONF_DIR" diff --git a/bitnami/apache/README.md b/bitnami/apache/README.md index 8cd75408443f..4b48612d2b7f 100644 --- a/bitnami/apache/README.md +++ b/bitnami/apache/README.md @@ -17,7 +17,7 @@ $ docker run --name apache bitnami/apache:latest ### Docker Compose ```console -$ curl -sSL https://raw.githubusercontent.com/bitnami/bitnami-docker-apache/master/docker-compose.yml > docker-compose.yml +$ curl -sSL https://raw.githubusercontent.com/bitnami/containers/main/bitnami/apache/docker-compose.yml > docker-compose.yml $ docker-compose up -d ``` @@ -47,9 +47,9 @@ Non-root container images add an extra layer of security and are generally recom Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). -* [`2.4`, `2.4-debian-11`, `2.4.54`, `2.4.54-debian-11-r17`, `latest` (2.4/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.54-debian-11-r17/2.4/debian-11/Dockerfile) +* [`2.4`, `2.4-debian-11`, `2.4.54`, `2.4.54-debian-11-r18`, `latest` (2.4/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/apache/2.4/debian-11/Dockerfile) -Subscribe to project updates by watching the [bitnami/apache GitHub repo](https://github.com/bitnami/bitnami-docker-apache). +Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers). ## Get this image @@ -65,10 +65,12 @@ To use a specific version, you can pull a versioned tag. You can view the [list $ docker pull bitnami/apache:[TAG] ``` -If you wish, you can also build the image yourself. +If you wish, you can also build the image yourself by cloning the repository, changing to the directory containing the Dockerfile and executing the `docker build` command. Remember to replace the `APP`, `VERSION` and `OPERATING-SYSTEM` path placeholders in the example command below with the correct values. ```console -$ docker build -t bitnami/apache:latest 'https://github.com/bitnami/bitnami-docker-apache.git#master:2.4/debian-11' +$ git clone https://github.com/bitnami/containers.git +$ cd bitnami/APP/VERSION/OPERATING-SYSTEM +$ docker build -t bitnami/APP:latest . ``` ## Hosting a static website @@ -525,17 +527,11 @@ $ docker-compose up apache ## Contributing -We'd love for you to contribute to this container. You can request new features by creating an [issue](https://github.com/bitnami/bitnami-docker-apache/issues), or submit a [pull request](https://github.com/bitnami/bitnami-docker-apache/pulls) with your contribution. +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 submit a [pull request](https://github.com/bitnami/containers/pulls) with your contribution. ## Issues -If you encountered a problem running this container, you can file an [issue](https://github.com/bitnami/bitnami-docker-apache/issues/new). For us to provide better support, be sure to include the following information in your issue: - -- Host OS and version -- Docker version (`docker version`) -- Output of `docker info` -- Version of this container -- The command you used to run the container, and any relevant output you saw (masking any sensitive information) +If you encountered a problem running this container, you can file an [issue](https://github.com/bitnami/containers/issues/new/choose). For us to provide better support, be sure to fill the issue template. ## License