From 9cb58e0970fb4cad06a7787418ceb3e39ca1b853 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Fri, 9 Jun 2017 15:08:08 -0700
Subject: [PATCH] Convert "redmine" to use "docker stack deploy"

---
 redmine/content.md                        | 4 ++--
 redmine/{docker-compose.yml => stack.yml} | 8 ++------
 wordpress/content.md                      | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)
 rename redmine/{docker-compose.yml => stack.yml} (70%)

diff --git a/redmine/content.md b/redmine/content.md
index 19e3f6e3e..7f248e6d7 100644
--- a/redmine/content.md
+++ b/redmine/content.md
@@ -42,9 +42,9 @@ Running Redmine with a database server is the recommened way.
 	$ docker run -d --name some-%%REPO%% --link some-postgres:postgres %%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).
 
 ## Alternative Web Server
 
diff --git a/redmine/docker-compose.yml b/redmine/stack.yml
similarity index 70%
rename from redmine/docker-compose.yml
rename to redmine/stack.yml
index f0d0b2eaa..5d460a2b0 100644
--- a/redmine/docker-compose.yml
+++ b/redmine/stack.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '3.1'
 
 services:
 
@@ -9,13 +9,9 @@ services:
     environment:
       REDMINE_DB_MYSQL: db
       REDMINE_DB_PASSWORD: example
-    depends_on:
-      - db
-    restart: always
 
   db:
-    image: mariadb
+    image: mysql:5.7
     environment:
       MYSQL_ROOT_PASSWORD: example
       MYSQL_DATABASE: redmine
-    restart: always
diff --git a/wordpress/content.md b/wordpress/content.md
index ece016a56..72cd07054 100644
--- a/wordpress/content.md
+++ b/wordpress/content.md
@@ -40,7 +40,7 @@ $ docker run --name some-%%REPO%% -e WORDPRESS_DB_HOST=10.1.2.3:3306 \
 
 ## %%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).
+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