Kevin Tessier 4 years ago
parent
commit
d90d608111
2 changed files with 6 additions and 13 deletions
  1. 1 0
      .gitignore
  2. 5 13
      docker-compose.yml

+ 1 - 0
.gitignore

@@ -5,3 +5,4 @@ wwwroot/html/*
 wwwroot/html/.*
 data/databasses/*
 data/databasses/.*
+nginx/ssl/*

+ 5 - 13
docker-compose.yml

@@ -3,6 +3,7 @@ version: '3.2'
 services:
 
   nginx:
+    name: "docker-nginx"
     image: "${NGINX_VERSION}"
     ports:
       - 80:80
@@ -19,11 +20,11 @@ services:
     restart: on-failure
 
   php-fpm:
-    # image: "${PHP_VERSION}"
+    name: "docker-php"
+    image: "${PHP_VERSION}"
     build: ./Docker/php-fpm/
     volumes:
       - ./etc/php-fpm/php-fpm.ini:/usr/local/etc/php-fpm.ini
-      # - ./etc/php-fpm/crontabs:/etc/crontabs
       - ./wwwroot:/var/www
     environment:
       ENABLE_CRONTAB: "true"
@@ -31,11 +32,9 @@ services:
     restart: on-failure
 
   mysql:
+    name: "docker-mysql"
     image: "${MYSQL_VERSION}"
-    # command: --default-authentication-plugin=mysql_native_password
     volumes:
-      # - ./etc/mysql/my.cnf:/etc/my.cnf
-      # - ./etc/mysql/my.cnf.d:/etc/my.cnf.d
       - ./data/mysql/databases:/var/lib/mysql
     environment:
       MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
@@ -44,6 +43,7 @@ services:
     restart: on-failure
 
   phpmyadmin:
+    name: "docker-phpmyadmin"
     image: "${PMA_VERSION}"
     ports:
       - 8081:80
@@ -53,11 +53,3 @@ services:
       PMA_HOST: mysql
       TZ: ${TZ}
     restart: on-failure
-
-  # redis:
-  #   image: "${REDIS_VERSION}"
-  #   volumes:
-  #     - ./data/redis/data:/data:rw
-  #   environment:
-  #     TZ: ${TZ}
-  #   restart: on-failure