From d187ac6a03c8aa7a9242367191c2641081e6bfb2 Mon Sep 17 00:00:00 2001
From: arifwdn <muhammadarifwardana01@gmail.com>
Date: Thu, 3 Aug 2023 10:59:38 +0800
Subject: [PATCH] Versi eug

---
 .env               |   2 +-
 docker-compose.yml | 123 +++++++++++++++++++++++++--------------------
 2 files changed, 69 insertions(+), 56 deletions(-)

diff --git a/.env b/.env
index 1138e9315..6b736e6ac 100644
--- a/.env
+++ b/.env
@@ -11,7 +11,7 @@ NGINX_HOST=localhost
 PHP_VERSION=latest
 
 # MySQL
-MYSQL_VERSION=8.0.21
+MYSQL_VERSION=latest
 MYSQL_HOST=mysql
 MYSQL_DATABASE=test
 MYSQL_ROOT_USER=root
diff --git a/docker-compose.yml b/docker-compose.yml
index b30cd5728..6375795e6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,56 +1,69 @@
-version: '3'
+version: "3.8"
 services:
-    web:
-        image: nginx:alpine
-        volumes:
-            - "./etc/nginx/default.conf:/etc/nginx/conf.d/default.conf"
-            - "./etc/ssl:/etc/ssl"
-            - "./web:/var/www/html"
-            - "./etc/nginx/default.template.conf:/etc/nginx/conf.d/default.template"
-        ports:
-            - "8000:80"
-            - "3000:443"
-        environment:
-            - NGINX_HOST=${NGINX_HOST}
-        command: /bin/sh -c "envsubst '$$NGINX_HOST' < /etc/nginx/conf.d/default.template > /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;'"
-        restart: always
-        depends_on:
-            - php
-            - mysqldb
-    php:
-        image: nanoninja/php-fpm:${PHP_VERSION}
-        restart: always
-        volumes:
-            - "./etc/php/php.ini:/usr/local/etc/php/conf.d/php.ini"
-            - "./web:/var/www/html"
-    composer:
-        image: "composer"
-        volumes:
-            - "./web/app:/app"
-        command: install
-    myadmin:
-        image: phpmyadmin/phpmyadmin
-        container_name: phpmyadmin
-        ports:
-            - "8080:80"
-        environment:
-            - PMA_ARBITRARY=1
-            - PMA_HOST=${MYSQL_HOST}
-        restart: always
-        depends_on:
-            - mysqldb
-    mysqldb:
-        image: mysql:${MYSQL_VERSION}
-        container_name: ${MYSQL_HOST}
-        restart: always
-        env_file:
-            - ".env"
-        environment:
-            - MYSQL_DATABASE=${MYSQL_DATABASE}
-            - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
-            - MYSQL_USER=${MYSQL_USER}
-            - MYSQL_PASSWORD=${MYSQL_PASSWORD}
-        ports:
-            - "8989:3306"
-        volumes:
-            - "./data/db/mysql:/var/lib/mysql"
\ No newline at end of file
+  web:
+    container_name: webApp
+    image: nginx:alpine
+    volumes:
+      - "./etc/nginx/default.conf:/etc/nginx/conf.d/default.conf"
+      - "./etc/ssl:/etc/ssl"
+      - "./web:/var/www/html"
+      - "./etc/nginx/default.template.conf:/etc/nginx/conf.d/default.template"
+    ports:
+      - "8000:80"
+      - "3000:443"
+    environment:
+      - NGINX_HOST=${NGINX_HOST}
+    command: /bin/sh -c "envsubst '$$NGINX_HOST' < /etc/nginx/conf.d/default.template > /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;'"
+    restart: always
+    depends_on:
+      - php
+      - mysqldb
+    networks:
+      - web-net
+  php:
+    image: nanoninja/php-fpm:${PHP_VERSION}
+    restart: always
+    volumes:
+      - "./etc/php/php.ini:/usr/local/etc/php/conf.d/php.ini"
+      - "./web:/var/www/html"
+  composer:
+    image: "composer"
+    volumes:
+      - "./web/app:/app"
+    command: install
+    networks:
+      - web-net
+  phpmyadmin:
+    image: phpmyadmin/phpmyadmin
+    container_name: phpmyadmin
+    ports:
+      - "8080:80"
+    environment:
+      - PMA_ARBITRARY=1
+      - PMA_HOST=${MYSQL_HOST}
+    restart: always
+    depends_on:
+      - mysqldb
+    networks:
+      - web-net
+  mysqldb:
+    image: mysql:${MYSQL_VERSION}
+    container_name: ${MYSQL_HOST}
+    restart: always
+    env_file:
+      - ".env"
+    environment:
+      - MYSQL_DATABASE=${MYSQL_DATABASE}
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - MYSQL_USER=${MYSQL_USER}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+    ports:
+      - "8989:3306"
+    volumes:
+      - "./data/db/mysql:/var/lib/mysql"
+    networks:
+      - web-net
+
+networks:
+  web-net:
+    driver: bridge