From 9a581cb403a904eb2afa27fd9ca1eae289650280 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Sat, 30 Jul 2022 12:38:24 +0200 Subject: [PATCH] [bitnami/dokuwiki] Release 20200729.0.0-debian-11-r20 (#1248) Signed-off-by: Bitnami Containers --- .../opt/bitnami/scripts/apache/setup.sh | 4 +-- bitnami/dokuwiki/README.md | 34 ++++++++----------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/bitnami/dokuwiki/20200729/debian-11/rootfs/opt/bitnami/scripts/apache/setup.sh b/bitnami/dokuwiki/20200729/debian-11/rootfs/opt/bitnami/scripts/apache/setup.sh index 3d7279aad46a..6fc139a94f2f 100755 --- a/bitnami/dokuwiki/20200729/debian-11/rootfs/opt/bitnami/scripts/apache/setup.sh +++ b/bitnami/dokuwiki/20200729/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/dokuwiki/README.md b/bitnami/dokuwiki/README.md index 3be1ea67d13b..a7c3be27f4b6 100644 --- a/bitnami/dokuwiki/README.md +++ b/bitnami/dokuwiki/README.md @@ -11,7 +11,7 @@ Trademarks: This software listing is packaged by Bitnami. The respective tradema ## TL;DR ```console -$ curl -sSL https://raw.githubusercontent.com/bitnami/bitnami-docker-dokuwiki/master/docker-compose.yml > docker-compose.yml +$ curl -sSL https://raw.githubusercontent.com/bitnami/containers/main/bitnami/dokuwiki/docker-compose.yml > docker-compose.yml $ docker-compose up -d ``` @@ -35,9 +35,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/). -* [`20200729`, `20200729-debian-11`, `20200729.0.0`, `20200729.0.0-debian-11-r19`, `latest` (20200729/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-dokuwiki/blob/20200729.0.0-debian-11-r19/20200729/debian-11/Dockerfile) +* [`20200729`, `20200729-debian-11`, `20200729.0.0`, `20200729.0.0-debian-11-r20`, `latest` (20200729/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/dokuwiki/20200729/debian-11/Dockerfile) -Subscribe to project updates by watching the [bitnami/dokuwiki GitHub repo](https://github.com/bitnami/bitnami-docker-dokuwiki). +Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers). ## Get this image @@ -53,10 +53,12 @@ To use a specific version, you can pull a versioned tag. You can view the [list $ docker pull bitnami/dokuwiki:[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/dokuwiki:latest 'https://github.com/bitnami/bitnami-docker-dokuwiki.git#master:20200729/debian-11' +$ git clone https://github.com/bitnami/containers.git +$ cd bitnami/APP/VERSION/OPERATING-SYSTEM +$ docker build -t bitnami/APP:latest . ``` ## Persisting your application @@ -71,7 +73,7 @@ To avoid inadvertent removal of volumes, you can mount host directories as data ### Mount host directories as data volumes with Docker Compose -This requires a minor change to the [`docker-compose.yml`](https://github.com/bitnami/bitnami-docker-dokuwiki/blob/master/docker-compose.yml) file present in this repository: +This requires a minor change to the [`docker-compose.yml`](https://github.com/bitnami/containers/blob/main/bitnami/dokuwiki/docker-compose.yml) file present in this repository: ```diff dokuwiki: @@ -112,7 +114,7 @@ $ docker run -d --name dokuwiki \ When you start the DokuWiki 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 in the [`docker-compose.yml`](https://github.com/bitnami/bitnami-docker-dokuwiki/blob/master/docker-compose.yml) file present in this repository: + * For docker-compose add the variable name and value under the application section in the [`docker-compose.yml`](https://github.com/bitnami/containers/blob/main/bitnami/dokuwiki/docker-compose.yml) file present in this repository: ```yaml dokuwiki: @@ -257,9 +259,9 @@ The Bitnami DokuWiki Docker image is designed to be extended so it can be used a Before extending this image, please note there are certain configuration settings you can modify using the original image: - Settings that can be adapted using environment variables. For instance, you can change the ports used by Apache for HTTP and HTTPS, by setting the environment variables `APACHE_HTTP_PORT_NUMBER` and `APACHE_HTTPS_PORT_NUMBER` respectively. -- [Adding custom virtual hosts](https://github.com/bitnami/bitnami-docker-apache#adding-custom-virtual-hosts). -- [Replacing the 'httpd.conf' file](https://github.com/bitnami/bitnami-docker-apache#full-configuration). -- [Using custom SSL certificates](https://github.com/bitnami/bitnami-docker-apache#using-custom-ssl-certificates). +- [Adding custom virtual hosts](https://github.com/bitnami/containers/blob/main/bitnami/apache#adding-custom-virtual-hosts). +- [Replacing the 'httpd.conf' file](https://github.com/bitnami/containers/blob/main/bitnami/apache#full-configuration). +- [Using custom SSL certificates](https://github.com/bitnami/containers/blob/main/bitnami/apache#using-custom-ssl-certificates). If your desired customizations cannot be covered using the methods mentioned above, extend the image. To do so, create your own image using a Dockerfile with the format below: @@ -295,7 +297,7 @@ ENV APACHE_HTTPS_PORT_NUMBER=8143 EXPOSE 8181 8143 ``` -Based on the extended image, you can update the [`docker-compose.yml`](https://github.com/bitnami/bitnami-docker-dokuwiki/blob/master/docker-compose.yml) file present in this repository to add other features: +Based on the extended image, you can update the [`docker-compose.yml`](https://github.com/bitnami/containers/blob/main/bitnami/dokuwiki/docker-compose.yml) file present in this repository to add other features: ```diff dokuwiki: @@ -350,17 +352,11 @@ Based on the extended image, you can update the [`docker-compose.yml`](https://g ## 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-dokuwiki/issues), or submit a [pull request](https://github.com/bitnami/bitnami-docker-dokuwiki/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-dokuwiki/issues/new). 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. ### Community supported solution