From 54359bd26c41e63c6e50ccd338b5a18d8b572c60 Mon Sep 17 00:00:00 2001 From: Marcos Lilljedahl Date: Sun, 18 Jun 2017 16:37:00 -0300 Subject: [PATCH] Migrate current compose examples to PWD capable stacks --- drupal/content.md | 4 +++- drupal/{docker-compose.yml => stack.yml} | 2 +- geonetwork/content.md | 5 +++-- geonetwork/{docker-compose.yml => stack.yml} | 8 ++++++-- joomla/content.md | 4 ++-- joomla/docker-compose.yml | 11 ----------- joomla/stack.yml | 17 +++++++++++++++++ owncloud/content.md | 4 +++- owncloud/{docker-compose.yml => stack.yml} | 2 +- 9 files changed, 36 insertions(+), 21 deletions(-) rename drupal/{docker-compose.yml => stack.yml} (98%) rename geonetwork/{docker-compose.yml => stack.yml} (79%) delete mode 100644 joomla/docker-compose.yml create mode 100644 joomla/stack.yml rename owncloud/{docker-compose.yml => stack.yml} (97%) diff --git a/drupal/content.md b/drupal/content.md index 1747c5b44..d56bcca23 100644 --- a/drupal/content.md +++ b/drupal/content.md @@ -81,7 +81,9 @@ $ docker run --name some-%%REPO%% --link some-postgres:postgres -d \ -v %%REPO%%-themes:/var/www/html/themes \ ``` -## %%COMPOSE%% +## %%STACK%% + +Run `docker stack deploy -c stack.yml %%REPO%%` (or `docker-compose -f stack.yml up`), wait for it to initialize completely, and visit `http://swarm-ip:8080`, `http://localhost:8080`, or `http://host-ip:8080` (as appropriate). When installing select `postgres` as database with the following parameters: `dbname=postgres` `user=postgres` `pass=example` `hostname=postgres` ## Adding additional libraries / extensions diff --git a/drupal/docker-compose.yml b/drupal/stack.yml similarity index 98% rename from drupal/docker-compose.yml rename to drupal/stack.yml index 44bb30869..5df386a26 100644 --- a/drupal/docker-compose.yml +++ b/drupal/stack.yml @@ -10,7 +10,7 @@ # Database password: example # ADVANCED OPTIONS; Database host: postgres -version: '2' +version: '3.1' services: diff --git a/geonetwork/content.md b/geonetwork/content.md index 942767bba..26ad61b28 100644 --- a/geonetwork/content.md +++ b/geonetwork/content.md @@ -52,9 +52,10 @@ If you want the data directory to live beyond restarts, or even destruction of t $ docker run --name some-%%REPO%% -d -p 8080:8080 -e DATA_DIR=/var/lib/geonetwork_data -v /host/geonetwork-docker:/var/lib/geonetwork_data %%REPO%% ``` -## %%COMPOSE%% +## %%STACK%% + +Run `docker stack deploy -c stack.yml %%REPO%%` (or `docker-compose -f stack.yml up`), wait for it to initialize completely, and visit `http://swarm-ip:8080/geonetwork`, `http://localhost:8080/geonetwork`, or `http://host-ip:8080/geonetwork` (as appropriate). -Run `docker-compose up`, wait for it to initialize completely, and visit `http://localhost:8080/geonetwork` or `http://host-ip:8080/geonetwork`. ## Default credentials diff --git a/geonetwork/docker-compose.yml b/geonetwork/stack.yml similarity index 79% rename from geonetwork/docker-compose.yml rename to geonetwork/stack.yml index 6d700678e..7b29fd8db 100644 --- a/geonetwork/docker-compose.yml +++ b/geonetwork/stack.yml @@ -5,7 +5,7 @@ # Default user: admin # Default password: admin -version: '2' +version: '3.1' services: geonetwork: @@ -15,4 +15,8 @@ services: environment: DATA_DIR: /var/lib/geonetwork_data volumes: - - "/host/geonetwork-docker:/var/lib/geonetwork_data" + - geonetwork:/var/lib/geonetwork_data + +volumes: + geonetwork: + diff --git a/joomla/content.md b/joomla/content.md index fb176714d..0204ffe32 100644 --- a/joomla/content.md +++ b/joomla/content.md @@ -36,9 +36,9 @@ $ docker run --name some-%%REPO%% -e JOOMLA_DB_HOST=10.1.2.3:3306 \ -e JOOMLA_DB_USER=... -e JOOMLA_DB_PASSWORD=... -d %%REPO%% ``` -## %%COMPOSE%% +## %%STACK%% -Run `docker-compose up`, wait for it to initialize completely, and visit `http://localhost:8080` or `http://host-ip:8080`. +Run `docker stack deploy -c stack.yml %%REPO%%` (or `docker-compose -f stack.yml up`), wait for it to initialize completely, and visit `http://swarm-ip:8080`, `http://localhost:8080`, or `http://host-ip:8080` (as appropriate). ## Adding additional libraries / extensions diff --git a/joomla/docker-compose.yml b/joomla/docker-compose.yml deleted file mode 100644 index b30e54836..000000000 --- a/joomla/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -joomla: - image: joomla - links: - - joomladb:mysql - ports: - - 8080:80 - -joomladb: - image: mysql:5.6 - environment: - MYSQL_ROOT_PASSWORD: example diff --git a/joomla/stack.yml b/joomla/stack.yml new file mode 100644 index 000000000..68cb39dd4 --- /dev/null +++ b/joomla/stack.yml @@ -0,0 +1,17 @@ +version: '3.1' + +services: + joomla: + image: joomla + links: + - joomladb:mysql + ports: + - 8080:80 + environment: + JOOMLA_DB_HOST: joomladb + JOOMLA_DB_PASSWORD: example + + joomladb: + image: mysql:5.6 + environment: + MYSQL_ROOT_PASSWORD: example diff --git a/owncloud/content.md b/owncloud/content.md index b85dfa0c0..10d583238 100644 --- a/owncloud/content.md +++ b/owncloud/content.md @@ -44,4 +44,6 @@ The [`occ` tool from upstream](https://doc.owncloud.org/server/9.0/admin_manual/ $ docker exec -u www-data some-owncloud php occ status ``` -## %%COMPOSE%% +## %%STACK%% + +Run `docker stack deploy -c stack.yml %%REPO%%` (or `docker-compose -f stack.yml up`), wait for it to initialize completely, and visit `http://swarm-ip:8080/`, `http://localhost:8080/`, or `http://host-ip:8080` (as appropriate). diff --git a/owncloud/docker-compose.yml b/owncloud/stack.yml similarity index 97% rename from owncloud/docker-compose.yml rename to owncloud/stack.yml index 9d827f349..2b65c429b 100644 --- a/owncloud/docker-compose.yml +++ b/owncloud/stack.yml @@ -8,7 +8,7 @@ # Database name: pick any name # Database host: replace "localhost" with "mysql" -version: '2' +version: '3.1' services: