Migrate current compose examples to PWD capable stacks

judgej · Jun 18, 2017 · 54359bd · 54359bd
1 parent 60c7d86
commit 54359bd
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 21 deletions.
diff --git 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 → drupal/stack.yml b/drupal/docker-compose.yml → 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
@@ -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 → geonetwork/stack.yml b/geonetwork/docker-compose.yml → 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
@@ -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
diff --git a/joomla/stack.yml 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
@@ -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 → owncloud/stack.yml b/owncloud/docker-compose.yml → owncloud/stack.yml
@@ -8,7 +8,7 @@
 # Database name: pick any name
 # Database host: replace "localhost" with "mysql"
 
-version: '2'
+version: '3.1'
 
 services: