1 files changed, 47 insertions, 42 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index c774b621..26fba8f0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,42 +1,47 @@
-nginx:
+version: '2'
-    image: nginx
+services:
-    ports:
+    nginx:
-        - "8080:80"
+        image: nginx
-    volumes:
+        ports:
-        - ./docker/nginx/nginx.conf:/nginx.conf
+            - "8080:80"
-        - ./docker/logs/nginx:/var/log/nginx
+        volumes:
-        - .:/var/www/html
+            - ./docker/nginx/nginx.conf:/nginx.conf
-    links:
+            - ./docker/logs/nginx:/var/log/nginx
-        - php:php
+            - .:/var/www/html
-    command: nginx -c /nginx.conf
+        links:
-php:
+            - php:php
-    build: docker/php
+        command: nginx -c /nginx.conf
-    ports:
+    php:
-        - "9000:9000"
+        build:
-    volumes:
+            context: docker/php
-        - .:/var/www/html
+            args:
-    #links:
+                timezone: 'Europe/Monaco'
-        # - "postgres:rdbms"
+        ports:
-        # - "mariadb:rdbms"
+            - "9000:9000"
-    env_file:
+        volumes:
-        - ./docker/php/env
+            - .:/var/www/html
-        # Comment non-used DBMS lines
+        #links:
-        # If all DBMS are commented out, sqlite will be used as default
+            # - "postgres:rdbms"
-        # - ./docker/postgres/env
+            # - "mariadb:rdbms"
-        # - ./docker/mariadb/env
+        env_file:
-#postgres:
+            - ./docker/php/env
-#    image: postgres:9
+            # Comment non-used DBMS lines
-#    ports:
+            # If all DBMS are commented out, sqlite will be used as default
-#        - "5432:5432"
+            # - ./docker/postgres/env
-#    volumes:
+            # - ./docker/mariadb/env
-#        - ./docker/data/pgsql:/var/lib/postgresql/data
+    #postgres:
-#    env_file:
+    #    image: postgres:9
-#        - ./docker/postgres/env
+    #    ports:
-#mariadb:
+    #        - "5432:5432"
-#    image: mariadb:10
+    #    volumes:
-#    ports:
+    #        - ./docker/data/pgsql:/var/lib/postgresql/data
-#        - "3306:3306"
+    #    env_file:
-#    volumes:
+    #        - ./docker/postgres/env
-#        - ./docker/data/mariadb:/var/lib/mysql
+    #mariadb:
-#    env_file:
+    #    image: mariadb:10
-#        - ./docker/mariadb/env
+    #    ports:
+    #        - "3306:3306"
+    #    volumes:
+    #        - ./docker/data/mariadb:/var/lib/mysql
+    #    env_file:
+    #        - ./docker/mariadb/env

diff --git a/docker-compose.yml b/docker-compose.yml index c774b621..26fba8f0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml
@@ -1,42 +1,47 @@
1	nginx:	1	version: '2'
2	image: nginx	2	services:
3	ports:	3	nginx:
4	- "8080:80"	4	image: nginx
5	volumes:	5	ports:
6	- ./docker/nginx/nginx.conf:/nginx.conf	6	- "8080:80"
7	- ./docker/logs/nginx:/var/log/nginx	7	volumes:
8	- .:/var/www/html	8	- ./docker/nginx/nginx.conf:/nginx.conf
9	links:	9	- ./docker/logs/nginx:/var/log/nginx
10	- php:php	10	- .:/var/www/html
11	command: nginx -c /nginx.conf	11	links:
12	php:	12	- php:php
13	build: docker/php	13	command: nginx -c /nginx.conf
14	ports:	14	php:
15	- "9000:9000"	15	build:
16	volumes:	16	context: docker/php
17	- .:/var/www/html	17	args:
18	#links:	18	timezone: 'Europe/Monaco'
19	# - "postgres:rdbms"	19	ports:
20	# - "mariadb:rdbms"	20	- "9000:9000"
21	env_file:	21	volumes:
22	- ./docker/php/env	22	- .:/var/www/html
23	# Comment non-used DBMS lines	23	#links:
24	# If all DBMS are commented out, sqlite will be used as default	24	# - "postgres:rdbms"
25	# - ./docker/postgres/env	25	# - "mariadb:rdbms"
26	# - ./docker/mariadb/env	26	env_file:
27	#postgres:	27	- ./docker/php/env
28	# image: postgres:9	28	# Comment non-used DBMS lines
29	# ports:	29	# If all DBMS are commented out, sqlite will be used as default
30	# - "5432:5432"	30	# - ./docker/postgres/env
31	# volumes:	31	# - ./docker/mariadb/env
32	# - ./docker/data/pgsql:/var/lib/postgresql/data	32	#postgres:
33	# env_file:	33	# image: postgres:9
34	# - ./docker/postgres/env	34	# ports:
35	#mariadb:	35	# - "5432:5432"
36	# image: mariadb:10	36	# volumes:
37	# ports:	37	# - ./docker/data/pgsql:/var/lib/postgresql/data
38	# - "3306:3306"	38	# env_file:
39	# volumes:	39	# - ./docker/postgres/env
40	# - ./docker/data/mariadb:/var/lib/mysql	40	#mariadb:
41	# env_file:	41	# image: mariadb:10
42	# - ./docker/mariadb/env	42	# ports:
		43	# - "3306:3306"
		44	# volumes:
		45	# - ./docker/data/mariadb:/var/lib/mysql
		46	# env_file:
		47	# - ./docker/mariadb/env