diff --git a/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/apache/setup.sh b/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/apache/setup.sh index 3d7279aad46a..6fc139a94f2f 100755 --- a/bitnami/wordpress/6/debian-11/rootfs/opt/bitnami/scripts/apache/setup.sh +++ b/bitnami/wordpress/6/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/wordpress/README.md b/bitnami/wordpress/README.md index 1134e6d1e342..a306283e2f41 100644 --- a/bitnami/wordpress/README.md +++ b/bitnami/wordpress/README.md @@ -41,9 +41,8 @@ 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/). -- [`6`, `6-debian-11`, `6.0.1`, `6.0.1-debian-11-r5`, `latest` (6/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/wordpress/6/debian-11/Dockerfile) +- [`6`, `6-debian-11`, `6.0.1`, `6.0.1-debian-11-r6`, `latest` (6/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/wordpress/6/debian-11/Dockerfile) - [`6`, `6-debian-10`, `6.0.1`, `6.0.1-debian-10-r-1`, `latest` (6/debian-10/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/wordpress/6/debian-10/Dockerfile) -- [`5`, `5-debian-11`, `5.9.3`, `5.9.3-debian-11-r23` (5/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/wordpress/5/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers). @@ -630,10 +629,6 @@ Based on the extended image, you can update the [`docker-compose.yml`](https://g - **wp-cli** tool is included in the Docker image. Find it at **/opt/bitnami/wp-cli/bin/wp**. -## Branch Deprecation Notice - -WordPress's branch 5.x.x is no longer maintained by upstream and is now internally tagged as to be deprecated. This branch will no longer be released in our catalog a month after this notice is published, but already released container images will still persist in the registries. Valid to be removed starting on: 07-29-2022 - ## 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 submit a [pull request](https://github.com/bitnami/containers/pulls) with your contribution.