diff --git a/bitnami/dokuwiki/20230404/debian-11/Dockerfile b/bitnami/dokuwiki/20230404/debian-11/Dockerfile index 191755b4672e..ff9eef057bc0 100644 --- a/bitnami/dokuwiki/20230404/debian-11/Dockerfile +++ b/bitnami/dokuwiki/20230404/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="2023-12-24T08:47:18Z" \ + org.opencontainers.image.created="2024-01-19T17:46:08Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="20230404.1.0-debian-11-r106" \ + org.opencontainers.image.ref.name="20230404.1.0-debian-11-r107" \ org.opencontainers.image.title="dokuwiki" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="20230404.1.0" @@ -26,10 +26,10 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages acl ca-certificates curl ldap-utils libbrotli1 libbsd0 libbz2-1.0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 libldap-common liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam-ldapd libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 nslcd openssl procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.2.14-0-linux-${OS_ARCH}-debian-11" \ + "php-8.2.15-0-linux-${OS_ARCH}-debian-11" \ "apache-2.4.58-2-linux-${OS_ARCH}-debian-11" \ - "libphp-8.2.14-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "libphp-8.2.15-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-5-linux-${OS_ARCH}-debian-11" \ "dokuwiki-20230404.1.0-3-linux-${OS_ARCH}-debian-11" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ @@ -44,6 +44,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ RUN 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/dokuwiki/20230404/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/dokuwiki/20230404/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index af14750a0411..f2107a0b4b94 100644 --- a/bitnami/dokuwiki/20230404/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/dokuwiki/20230404/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -15,18 +15,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.14-0" + "version": "8.2.15-0" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.2.14-0" + "version": "8.2.15-0" }, "render-template": { "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/dokuwiki/20230404/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/dokuwiki/20230404/debian-11/prebuildfs/usr/sbin/run-script index b7a5bf1e50bf..4ca0f897277e 100755 --- a/bitnami/dokuwiki/20230404/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/dokuwiki/20230404/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-y}" +fail_if_not_present="${3:-n}" if test -f "$script"; then sh $script diff --git a/bitnami/dokuwiki/README.md b/bitnami/dokuwiki/README.md index 41a3bdd7d5dc..32cbe9235473 100644 --- a/bitnami/dokuwiki/README.md +++ b/bitnami/dokuwiki/README.md @@ -10,8 +10,7 @@ Trademarks: This software listing is packaged by Bitnami. The respective tradema ## TL;DR ```console -curl -sSL https://raw.githubusercontent.com/bitnami/containers/main/bitnami/dokuwiki/docker-compose.yml > docker-compose.yml -docker-compose up -d +docker run --name dokuwiki bitnami/dokuwiki:latest ``` You can find the default credentials and available configuration options in the [Environment Variables](#environment-variables) section. @@ -112,6 +111,25 @@ docker run -d --name dokuwiki \ ### Environment variables +#### Customizable environment variables + +| Name | Description | Default Value | +|----------------------------|--------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------| +| `DOKUWIKI_DATA_TO_PERSIST` | Files to persist relative to the DokuWiki installation directory. To provide multiple values, separate them with a whitespace. | `data conf lib/plugins lib/tpl lib/images/smileys/local lib/images/interwiki` | +| `DOKUWIKI_USERNAME` | DokuWiki superuser username | `user` | +| `DOKUWIKI_FULL_NAME` | Full Name of the DokuWiki superuser | `FirstName LastName` | +| `DOKUWIKI_EMAIL` | Email for the application superuser | `user@example.com` | +| `DOKUWIKI_PASSWORD` | DokuWiki password | `bitnami1` | +| `DOKUWIKI_WIKI_NAME` | Name for the wiki | `Bitnami DokuWiki` | + +#### Read-only environment variables + +| Name | Description | Value | +|----------------------------|-----------------------------------------------------|----------------------------------| +| `DOKUWIKI_BASE_DIR` | DokuWiki installation directory. | `${BITNAMI_ROOT_DIR}/dokuwiki` | +| `DOKUWIKI_VOLUME_DIR` | DokuWiki directory for mounted configuration files. | `${BITNAMI_VOLUME_DIR}/dokuwiki` | +| `PHP_DEFAULT_MEMORY_LIMIT` | Default PHP memory limit. | `256M` | + 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/containers/blob/main/bitnami/dokuwiki/docker-compose.yml) file present in this repository: @@ -134,28 +152,6 @@ dokuwiki: bitnami/dokuwiki:latest ``` -Available environment variables: - -#### User and Site configuration - -* `DOKUWIKI_USERNAME`: Dokuwiki application username. Default: **user** -* `DOKUWIKI_FULL_NAME`: Dokuwiki application user full name. Default: **Full Name** -* `DOKUWIKI_PASSWORD`: Dokuwiki application password. Default: **bitnami1** -* `DOKUWIKI_EMAIL`: Dokuwiki application email. Default: **user@example.com** -* `DOKUWIKI_WIKI_NAME`: Dokuwiki wiki name. Default: **Bitnami DokuWiki** - -#### PHP configuration - -* `PHP_ENABLE_OPCACHE`: Enable OPcache for PHP scripts. No default. -* `PHP_EXPOSE_PHP`: Enables HTTP header with PHP version. No default. -* `PHP_MAX_EXECUTION_TIME`: Maximum execution time for PHP scripts. No default. -* `PHP_MAX_INPUT_TIME`: Maximum input time for PHP scripts. No default. -* `PHP_MAX_INPUT_VARS`: Maximum amount of input variables for PHP scripts. No default. -* `PHP_MEMORY_LIMIT`: Memory limit for PHP scripts. Default: **256M** -* `PHP_POST_MAX_SIZE`: Maximum size for PHP POST requests. No default. -* `PHP_UPLOAD_MAX_FILESIZE`: Maximum file size for PHP uploads. No default. -* `PHP_OUTPUT_BUFFERING`: Size of the output buffer for PHP. Default: **8196** - ## Logging The Bitnami DokuWiki Docker image sends the container logs to `stdout`. To view the logs: @@ -349,6 +345,12 @@ Based on the extended image, you can update the [`docker-compose.yml`](https://g * Custom InterWiki shortcut icons, available in `lib/images/interwiki/`, are now persisted. * In order to upgrade your image from previous versions. +## 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/dokuwiki). + +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.