Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-04 14:57:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

0.20170219.201703072115-r1 release

Browse Source 
Removes VOLUME instruction from the Dockerfile
This commit is contained in:
Bitnami Bot
2017-07-04 16:30:36 +00:00
parent 1533184a3e
commit 638e7e0768
3 changed files with 43 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bitnami/dokuwiki/0/Dockerfile
View File

@@ -15,7 +15,7 @@ COPY rootfs /
ENV APACHE_HTTPS_PORT_NUMBER="443" \
APACHE_HTTP_PORT_NUMBER="80" \
BITNAMI_APP_NAME="dokuwiki" \
BITNAMI_IMAGE_VERSION="0.20170219.201703072115-r0" \
BITNAMI_IMAGE_VERSION="0.20170219.201703072115-r1" \
DOKUWIKI_EMAIL="user@example.com" \
DOKUWIKI_FULL_NAME="Full Name" \
DOKUWIKI_PASSWORD="bitnami1" \
@@ -25,7 +25,6 @@ ENV APACHE_HTTPS_PORT_NUMBER="443" \
VOLUME ["/bitnami/apache","/bitnami/dokuwiki"]
EXPOSE 80 443

5
bitnami/dokuwiki/0/docker-compose.yml
View File

@@ -8,10 +8,7 @@ services:
- '80:80'
- '443:443'
volumes:
- 'dokuwiki_data:/bitnami/dokuwiki'
- 'apache_data:/bitnami/apache'
- 'dokuwiki_data:/bitnami'
volumes:
dokuwiki_data:
driver: local
apache_data:
driver: local

115
bitnami/dokuwiki/README.md
View File

@@ -1,5 +1,5 @@
[![CircleCI](https://circleci.com/gh/bitnami/bitnami-docker-dokuwiki/tree/master.svg?style=shield)](https://circleci.com/gh/bitnami/bitnami-docker-dokuwiki/tree/master)
[![Slack](http://slack.oss.bitnami.com/badge.svg)](http://slack.oss.bitnami.com)
[![Slack](https://img.shields.io/badge/slack-join%20chat%20%E2%86%92-e01563.svg)](http://slack.oss.bitnami.com)
[![Kubectl](https://img.shields.io/badge/kubectl-Available-green.svg)](https://raw.githubusercontent.com/bitnami/bitnami-docker-dokuwiki/master/kubernetes.yml)
# What is DokuWiki?
@@ -13,15 +13,15 @@ https://www.dokuwiki.org/
## Docker Compose
```bash
$ curl -LO https://raw.githubusercontent.com/bitnami/bitnami-docker-dokuwiki/master/docker-compose.yml
$ docker-compose up
$ curl -sSL https://raw.githubusercontent.com/bitnami/bitnami-docker-dokuwiki/master/docker-compose.yml > docker-compose.yml
$ docker-compose up -d
```
## Kubernetes
> **WARNING:** This is a beta configuration, currently unsupported.
Get the raw URL pointing to the kubernetes.yml manifest and use kubectl to create the resources on your Kubernetes cluster like so:
Get the raw URL pointing to the `kubernetes.yml` manifest and use `kubectl` to create the resources on your Kubernetes cluster like so:
```bash
$ kubectl create -f https://raw.githubusercontent.com/bitnami/bitnami-docker-dokuwiki/master/kubernetes.yml
@@ -41,7 +41,6 @@ To run this application you need Docker Engine 1.10.0. Docker Compose is recomen
# How to use this image
### Run the application using Docker Compose
This is the recommended way to run Dokuwiki. You can use the following docker compose template:
@@ -55,16 +54,10 @@ services:
- '80:80'
- '443:443'
volumes:
- 'dokuwiki_data:/bitnami/dokuwiki'
- 'apache_data:/bitnami/apache'
- 'php_data:/bitnami/php'
- 'dokuwiki_data:/bitnami'
volumes:
dokuwiki_data:
driver: local
apache_data:
driver: local
php_data:
driver: local
```
### Run the application manually
@@ -77,25 +70,28 @@ If you want to run the application manually instead of using docker-compose, the
$ docker network create dokuwiki-tier
```
2. Run the Dokuwiki container:
```bash
$ docker run -d -p 80:80 -p 443:443 --name dokuwiki --net dokuwiki-tier bitnami/dokuwiki:latest
$ 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/
## Persisting your application
If you remove the container all your data and configurations will be lost, and the next time you run the image the database 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 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:
For persistence you should mount a volume at the `/bitnami` path. The above examples define a docker volume namely `dokuwiki_data`. The DokuWiki application state will persist as long as this volume is not removed.
> **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.
To avoid inadvertent removal of this volume you can [mount host directories as data volumes](https://docs.docker.com/engine/tutorials/dockervolumes/). Alternatively you can make use of volume plugins to host the volume data.
### Mount persistent folders in the host using docker-compose
This requires a sightly modification from the template previously shown:
```yaml
version: '2'
@@ -106,9 +102,7 @@ services:
- '80:80'
- '443:443'
volumes:
- '/path/to/dokuwiki-persistence:/bitnami/dokuwiki'
- '/path/to/apache-persistence:/bitnami/apache'
- '/path/to/php-persistence:/bitnami/php'
- '/path/to/dokuwiki-persistence:/bitnami'
```
### Mount persistent folders manually
@@ -126,15 +120,13 @@ In this case you need to specify the directories to mount on the run command. Th
```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 \
--volume /path/to/dokuwiki-persistence:/bitnami \
bitnami/dokuwiki:latest
```
# Upgrade this application
Bitnami provides up-to-date versions of MariaDB and Dokuwiki, including security patches, soon after they are made upstream. We recommend that you follow these steps to upgrade your container. We will cover here the upgrade of the Dokuwiki container. For the MariaDB upgrade see https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#upgrade-this-image
Bitnami provides up-to-date versions of Dokuwiki, including security patches, soon after they are made upstream. We recommend that you follow these steps to upgrade your container. We will cover here the upgrade of the Dokuwiki container.
1. Get the updated images:
@@ -147,9 +139,15 @@ $ docker pull bitnami/dokuwiki:latest
* For docker-compose: `$ docker-compose stop dokuwiki`
* For manual execution: `$ docker stop dokuwiki`
3. (For non-compose execution only) Create a [backup](#backing-up-your-application) if you have not mounted the dokuwiki folder in the host.
3. Take a snapshot of the application state
4. Remove the currently running container
```bash
$ rsync -a /path/to/dokuwiki-persistence /path/to/dokuwiki-persistence.bkp.$(date +%Y%m%d-%H.%M.%S)
```
You can use this snapshot to restore the application state should the upgrade fail.
4. Remove the stopped container
* For docker-compose: `$ docker-compose rm -v dokuwiki`
* For manual execution: `$ docker rm -v dokuwiki`
@@ -160,33 +158,30 @@ $ docker pull bitnami/dokuwiki:latest
* For manual execution ([mount](#mount-persistent-folders-manually) the directories if needed): `docker run --name dokuwiki bitnami/dokuwiki:latest`
# Configuration
## Environment variables
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:
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
```
```yaml
dokuwiki:
image: bitnami/dokuwiki:latest
ports:
- 80:80
- 443:443
environment:
- DOKUWIKI_PASSWORD=my_password
```
* For manual execution add a `-e` option with each variable and value:
```bash
```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
```
@@ -198,47 +193,19 @@ Available variables:
- `DOKUWIKI_EMAIL`: Dokuwiki application email. Default: **user@example.com**
- `DOKUWIKI_WIKI_NAME`: Dokuwiki wiki name. Default: **Bitnami DokuWiki**
# Backing up your application
To backup your application data follow these steps:
1. Stop the running container:
* For docker-compose: `$ docker-compose stop dokuwiki`
* For manual execution: `$ docker stop dokuwiki`
2. Copy the Dokuwiki data folder in the host:
```
$ 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
To restore your application using backed up data simply mount the folder with Dokuwiki data in the container. See [persisting your application](#persisting-your-application) section for more info.
# 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/bitnami-docker-dokuwiki/issues), or submit a [pull request](https://github.com/bitnami/bitnami-docker-dokuwiki/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). For us to provide better support,
be sure to include the following information in your issue:
If you encountered a problem running this container, you can file an [issue](https://github.com/bitnami/bitnami-docker-dokuwiki/issues). 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 (`$ 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)
- The command you used to run the container, and any relevant output you saw (masking any sensitive information)
# Community
@@ -248,7 +215,7 @@ Discussions are archived at [bitnami-oss.slackarchive.io](https://bitnami-oss.sl
# License
Copyright 2017 Bitnami
Copyright 2016-2017 Bitnami
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.