From 3b2852795ae369b9d1cc2c96a219ec8b9f0962bf Mon Sep 17 00:00:00 2001
From: ashnchiquita <16521248@mahasiswa.itb.ac.id>
Date: Sun, 12 Nov 2023 09:45:04 +0700
Subject: [PATCH] feat: docker adjustment
---
docker-compose.yml | 48 +++++++++++++++++++++++++++++++++---------
scripts/build-image.sh | 2 +-
src/.env.example | 2 +-
3 files changed, 40 insertions(+), 12 deletions(-)
mode change 100644 => 100755 docker-compose.yml
diff --git a/docker-compose.yml b/docker-compose.yml
old mode 100644
new mode 100755
index b42c4fa..9413e8b
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,25 +1,53 @@
-version: '3.3'
+version: "3.3"
services:
- web:
- image: tubes-1:latest
+ cooklyst-app-web:
+ image: tubes-2-wbd-app:latest
ports:
- - 8008:80
- hostname: web-tubes-1
+ - "8008:80"
+ hostname: cooklyst-app-web
env_file: ./src/.env
volumes:
- ./src:/var/www/html
depends_on:
- - mysql
- mysql:
+ cooklyst-app-db:
+ condition: service_healthy
+
+ # COMMENT THIS IF YOU USE DOCKER CONFIG TO START ALL CONTAINERS
+ networks:
+ - app-mysql
+
+ cooklyst-app-db:
image: mysql:latest
ports:
- 3307:3306
- hostname: db-tubes-1
+ hostname: cooklyst-app-db
env_file: ./src/.env
volumes:
- ./mysql:/var/lib/mysql
+ healthcheck:
+ test:
+ [
+ "CMD",
+ "mysqladmin",
+ "ping",
+ "-h",
+ "localhost",
+ "-u",
+ "root",
+ "-p$$MYSQL_ROOT_PASSWORD",
+ ]
+ interval: 10s
+ timeout: 3s
+ retries: 5
+
+ # COMMENT THIS IF YOU USE DOCKER CONFIG TO START ALL CONTAINERS
+ networks:
+ - app-mysql
+
command:
- - '--skip-log-bin'
+ - "--skip-log-bin"
+
+# COMMENT THIS IF YOU USE DOCKER CONFIG TO START ALL CONTAINERS
networks:
- web-mysql:
+ app-mysql:
driver: bridge
diff --git a/scripts/build-image.sh b/scripts/build-image.sh
index ce096ba..b21b8e1 100644
--- a/scripts/build-image.sh
+++ b/scripts/build-image.sh
@@ -1 +1 @@
-docker build -t tubes-1:latest .
\ No newline at end of file
+docker build -t tubes-2-wbd-app:latest .
diff --git a/src/.env.example b/src/.env.example
index 8848bda..32837b7 100644
--- a/src/.env.example
+++ b/src/.env.example
@@ -1,7 +1,7 @@
# DATABASE
# root password cannot be empty
MYSQL_ROOT_PASSWORD=
-MYSQL_HOST=
+MYSQL_HOST=cooklyst-app-db
MYSQL_DATABASE=
MYSQL_USER=
MYSQL_PASSWORD=
--
GitLab