modify dockerfile

zr8091 · Apr 10, 2018 · c88653c · c88653c
1 parent d5b1352
commit c88653c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 18 deletions.
diff --git a/apache2/Dockerfile b/apache2/Dockerfile
@@ -1,6 +1,6 @@
 FROM webdevops/apache:ubuntu-16.04
 
-MAINTAINER Eric Pfeiffer <[email protected]>
+MAINTAINER Leo Qin
 
 ARG PHP_UPSTREAM_CONTAINER=php-fpm
 ARG PHP_UPSTREAM_PORT=9000

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -126,12 +126,12 @@ services:
 
 ### MongoDB Container #######################################
 
-  mongo:
+  mongodb:
     build: ./mongo
     ports:
       - "${MONGODB_PORT}:27017"
     volumes:
-      - ${DATA_SAVE_PATH}/mongo:/data/db
+      - ${DATA_SAVE_PATH}/mongodb:/data/db
     networks:
       - frontend
 
@@ -146,8 +146,6 @@ services:
     volumes:
       - ${DATA_SAVE_PATH}/couchdb:/opt/couchdb/data
       - ./logs/couchdb:/usr/local/var/log/couchdb
-    depends_on:
-      - php-fpm
     ports:
       - "${COUCHDB_PORT}:5984"
     networks:
@@ -172,8 +170,6 @@ services:
       - ${DATA_SAVE_PATH}/memcached:/var/lib/memcached
     ports:
       - "${MEMCACHED_HOST_PORT}:11211"
-    depends_on:
-      - php-fpm
     networks:
       - frontend
 
@@ -189,8 +185,6 @@ services:
     environment:
       - RABBITMQ_DEFAULT_USER=${RABBITMQ_DEFAULT_USER}
       - RABBITMQ_DEFAULT_PASS=${RABBITMQ_DEFAULT_PASS}
-    depends_on:
-      - php-fpm
     networks:
       - frontend
 

diff --git a/env.example b/env.example
@@ -42,10 +42,6 @@ APACHE_PHP_UPSTREAM_PORT=9000
 APACHE_PHP_UPSTREAM_TIMEOUT=60
 APACHE_DOCUMENT_ROOT=/var/www/
 
-### COUCHDB ###############################################
-
-COUCHDB_PORT=5984
-
 ### MYSQL #################################################
 
 MYSQL_VERSION=latest
@@ -56,10 +52,6 @@ MYSQL_PORT=3306
 MYSQL_ROOT_PASSWORD=root
 MYSQL_ENTRYPOINT_INITDB=./mysql/docker-entrypoint-initdb.d
 
-### REDIS #################################################
-
-REDIS_PORT=6379
-
 ### MARIADB ###############################################
 
 MARIADB_DATABASE=default
@@ -93,6 +85,14 @@ ELASTICSEARCH_HOST_TRANSPORT_PORT=9300
 
 MEMCACHED_HOST_PORT=11211
 
+### REDIS #################################################
+
+REDIS_PORT=6379
+
+### COUCHDB ###############################################
+
+COUCHDB_PORT=5984
+
 ### MONGODB ###############################################
 
 MONGODB_PORT=27017
diff --git a/mongo/Dockerfile → mongodb/Dockerfile b/mongo/Dockerfile → mongodb/Dockerfile
diff --git a/rabbitmq/Dockerfile b/rabbitmq/Dockerfile
@@ -1,6 +1,6 @@
 FROM rabbitmq
 
-MAINTAINER Mahmoud Zalt <[email protected]>
+MAINTAINER Leo Qin
 
 RUN rabbitmq-plugins enable --offline rabbitmq_management