Prechádzať zdrojové kódy

Merge pull request #933 from infosiftr/redmine-stack

Convert "redmine" to use "docker stack deploy"
yosifkit 8 rokov pred
rodič
commit
7639639dbb
3 zmenil súbory, kde vykonal 5 pridanie a 9 odobranie
  1. 2 2
      redmine/content.md
  2. 2 6
      redmine/stack.yml
  3. 1 1
      wordpress/content.md

+ 2 - 2
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
 

+ 2 - 6
redmine/docker-compose.yml → 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

+ 1 - 1
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