Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-07 18:17:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17 from bitnami/fixPersistence

Browse Source 
New php revision that fix an issue when restoring a persisted php configuration
This commit is contained in:
Juan Ariza Toledano
2017-01-24 14:09:32 +01:00
committed by GitHub
parent c479e42798 0ec70db376
commit 0835e3f1cd
2 changed files with 48 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bitnami/dokuwiki/Dockerfile
View File

@@ -3,16 +3,16 @@ FROM gcr.io/stacksmith-images/minideb:jessie-r8
MAINTAINER Bitnami <containers@bitnami.com>
ENV BITNAMI_APP_NAME=dokuwiki \
BITNAMI_IMAGE_VERSION=20160626a-r6 \
BITNAMI_IMAGE_VERSION=20160626a-r7 \
PATH=/opt/bitnami/php/bin:$PATH
# System packages required
RUN install_packages libssl1.0.0 libaprutil1 libapr1 libc6 libuuid1 libexpat1 libpcre3 libldap-2.4-2 libsasl2-2 libgnutls-deb0-28 zlib1g libp11-kit0 libtasn1-6 libnettle4 libhogweed2 libgmp10 libffi6 libxslt1.1 libtidy-0.99-0 libreadline6 libncurses5 libtinfo5 libsybdb5 libmcrypt4 libstdc++6 libpng12-0 libjpeg62-turbo libbz2-1.0 libxml2 libcurl3 libfreetype6 libicu52 libgcc1 libgcrypt20 libgssapi-krb5-2 liblzma5 libidn11 librtmp1 libssh2-1 libkrb5-3 libk5crypto3 libcomerr2 libgpg-error0 libkrb5support0 libkeyutils1
# Additional modules required
RUN bitnami-pkg unpack apache-2.4.23-11 --checksum e4876fc1514082af221105319ddc8f069e7e2305dded70633bbf9a5973f2d9be
RUN bitnami-pkg unpack php-5.6.28-1 --checksum e6a6a80ccd36d3e6c4edd4c6dd97d6247534584f023bf89dda6d13728138ca37
RUN bitnami-pkg install libphp-5.6.28-1 --checksum c7a1df270fad99fbcff23506574ec1467bac4e0f0f6d0bd34bf310446ec5d7f5
RUN bitnami-pkg unpack apache-2.4.25-0 --checksum 8b46af7d737772d7d301da8b30a2770b7e549674e33b8a5b07480f53c39f5c3f
RUN bitnami-pkg unpack php-5.6.30-1 --checksum 96835743d668832c0b8464711587e5339969a96cafa1b319ca058697efd2857c
RUN bitnami-pkg install libphp-5.6.30-0 --checksum b9689caaab61862444c97756b1a9bf575731c4d0e71aa962d58518a231b33155
# Install dokuwiki
RUN bitnami-pkg unpack dokuwiki-20160626a-0 --checksum dc458acf5ca9c4ab188938fcb7598547ad8ce9fef54e0d7515e6690e355f3d11

68
bitnami/dokuwiki/README.md
View File

@@ -19,7 +19,7 @@ To run this application you need Docker Engine 1.10.0. Docker Compose is recomen
This is the recommended way to run Dokuwiki. You can use the following docker compose template:
```
```yaml
version: '2'
services:
dokuwiki:
@@ -30,11 +30,14 @@ services:
volumes:
- 'dokuwiki_data:/bitnami/dokuwiki'
- 'apache_data:/bitnami/apache'
- 'php_data:/bitnami/php'
volumes:
dokuwiki_data:
driver: local
apache_data:
driver: local
php_data:
driver: local
```
### Run the application manually
@@ -43,15 +46,15 @@ If you want to run the application manually instead of using docker-compose, the
1. Create a new network for the application :
```
$ docker network create dokuwiki_network
```bash
$ docker network create dokuwiki-tier
```
2. Run the Dokuwiki container:
```
$ docker run -d -p 80:80 --name dokuwiki --net=dokuwiki_network bitnami/dokuwiki
```bash
$ docker run -d -p 80:80 -p 443:443 --name dokuwiki --net dokuwiki-tier bitnami/dokuwiki:latest
```
Then you can access your application at http://your-ip/
@@ -59,14 +62,14 @@ Then you can access your application at http://your-ip/
## Persisting your application
If you remove every container and volume all your data will be lost, and the next time you run the image the application will be reinitialized. To avoid this loss of data, you should mount a volume that will persist even after the container is removed. If you are using docker-compose your data will be persistent as long as you don't remove `mariadb_data` and `dokuwiki_data` data volumes. If you have run the containers manually or you want to mount the folders with persistent data in your host follow the next steps:
If you remove every container and volume all your data will be lost, and the next time you run the image the application will be reinitialized. To avoid this loss of data, you should mount a volume that will persist even after the container is removed. If you are using docker-compose your data will be persistent as long as you don't remove `mariadb_data`, `apache_data`, `php_data` and `dokuwiki_data` data volumes. If you have run the containers manually or you want to mount the folders with persistent data in your host follow the next steps:
> **Note!** If you have already started using your application, follow the steps on [backing](#backing-up-your-application) up to pull the data from your running container down to your host.
### Mount persistent folders in the host using docker-compose
This requires a sightly modification from the template previously shown:
```
```yaml
version: '2'
services:
@@ -76,8 +79,9 @@ services:
- '80:80'
- '443:443'
volumes:
- '/path/to/your/local/dokuwiki_data:/bitnami/dokuwiki'
- '/path/to/your/local/apache_data:/bitnami/apache'
- '/path/to/dokuwiki-persistence:/bitnami/dokuwiki'
- '/path/to/apache-persistence:/bitnami/apache'
- '/path/to/php-persistence:/bitnami/php'
```
### Mount persistent folders manually
@@ -86,14 +90,19 @@ In this case you need to specify the directories to mount on the run command. Th
1. If you haven't done this before, create a new network for the application :
```
$ docker network create dokuwiki_network
```bash
$ docker network create dokuwiki-tier
```
2. Run the Dokuwiki container:
```
$ docker run -d -p 80:80 --name dokuwiki -v /your/local/path/bitnami/dokuwiki:/bitnami/dokuwiki --network=dokuwiki_network bitnami/dokuwiki
```bash
$ docker run -d -p 80:80 -p 443:443 --name dokuwiki \
--net dokuwiki-tier \
--volume /path/to/dokuwiki-persistence:/bitnami/dokuwiki \
--volume /path/to/apache-persistence:/bitnami/apache \
--volume /path/to/php-persistence:/bitnami/php \
bitnami/dokuwiki:latest
```
# Upgrade this application
@@ -102,7 +111,7 @@ Bitnami provides up-to-date versions of MariaDB and Dokuwiki, including security
1. Get the updated images:
```
```bash
$ docker pull bitnami/dokuwiki:latest
```
@@ -128,22 +137,31 @@ $ docker pull bitnami/dokuwiki:latest
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:
```
```yaml
dokuwiki:
image: bitnami/dokuwiki:latest
ports:
- 80:80
- 443:443
environment:
- DOKUWIKI_PASSWORD=my_password
volumes_from:
- dokuwiki_data
- apache_data
- php_data
```
* For manual execution add a `-e` option with each variable and value:
```
$ docker run -d -e DOKUWIKI_PASSWORD=my_password -p 80:80 --name dokuwiki -v /your/local/path/bitnami/dokuwiki:/bitnami/dokuwiki --network=dokuwiki_network bitnami/dokuwiki
```
```bash
$ docker run -d -p 80:80 -p 443:443 --name dokuwiki \
-e DOKUWIKI_PASSWORD=my_password \
--net dokuwiki-tier \
--volume /path/to/dokuwiki-persistence:/bitnami/dokuwiki \
--volume /path/to/apache-persistence:/bitnami/apache \
--volume /path/to/php-persistence:/bitnami/php \
bitnami/dokuwiki:latest
```
Available variables:
@@ -167,7 +185,9 @@ To backup your application data follow these steps:
2. Copy the Dokuwiki data folder in the host:
```
$ docker cp /your/local/path/bitnami:/bitnami/dokuwiki
$ docker cp /path/to/dokuwiki-persitence:/bitnami/dokuwiki
$ docker cp /path/to/apache-persitence:/bitnami/apache
$ docker cp /path/to/php-persitence:/bitnami/php
```
# Restoring a backup
@@ -187,21 +207,21 @@ If you encountered a problem running this container, you can file an
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 (`echo $BITNAMI_APP_VERSION` inside the container)
- Docker version (`$ docker version`)
- Output of `$ docker info`
- Version of this container (`$ echo $BITNAMI_APP_VERSION` inside the container)
- The command you used to run the container, and any relevant output you saw (masking any sensitive
information)
# License
Copyright 2016 Bitnami
Copyright 2017 Bitnami
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
<http://www.apache.org/licenses/LICENSE-2.0>
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,