From 49577859c5f5ac0e9f9ccf265e5f9d6fabdb3428 Mon Sep 17 00:00:00 2001 From: 2swo Date: Thu, 14 Mar 2024 22:53:05 +0900 Subject: [PATCH 1/7] refactor(#363) main source code image_env --- docker-compose.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b4ab3a0d..b9545b1f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,10 +5,9 @@ services: ports: - '3000:3000' env_file: - - .env + - .env.development + # - .env.production (베포 ec2에서의 설정입니다) restart: always - environment: - TZ: Asia/Seoul redis: image: 2swo/redis From 07eec5d6a0bc1ea754e4f0553bb012867aa8098c Mon Sep 17 00:00:00 2001 From: 2swo Date: Thu, 14 Mar 2024 22:54:35 +0900 Subject: [PATCH 2/7] refactor(#363) redis image_env --- docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index b9545b1f..aa335692 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,7 +15,8 @@ services: - redis_data:/usr/local/etc/redis command: sh -c "redis-server /usr/local/etc/redis/redis.conf" env_file: - - .env + - .env.development + # - .env.production (베포 ec2에서의 설정입니다) ports: - ${REDIS_BINDING_PORT}:${REDIS_PORT} restart: always From 256b9739095f72aadf6154a80cf2993b0262d748 Mon Sep 17 00:00:00 2001 From: 2swo Date: Thu, 14 Mar 2024 22:55:10 +0900 Subject: [PATCH 3/7] refactor(#363) redis image_port --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index aa335692..0dbf193e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: - .env.development # - .env.production (베포 ec2에서의 설정입니다) ports: - - ${REDIS_BINDING_PORT}:${REDIS_PORT} + - '6379:6379' restart: always nginx-certbot: From 773d71e4dc7c9d9789d566343db4b97a6d7b4ca6 Mon Sep 17 00:00:00 2001 From: 2swo Date: Thu, 14 Mar 2024 22:56:45 +0900 Subject: [PATCH 4/7] =?UTF-8?q?refactor(#363)=20docker-compose=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=EB=B3=80=EC=88=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0dbf193e..c62002d6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,8 +15,7 @@ services: - redis_data:/usr/local/etc/redis command: sh -c "redis-server /usr/local/etc/redis/redis.conf" env_file: - - .env.development - # - .env.production (베포 ec2에서의 설정입니다) + - .redis.env ports: - '6379:6379' restart: always @@ -27,7 +26,7 @@ services: - '80:80' - '443:443' env_file: - - .env + - .nginx-certbot.env volumes: redis_data: From 5638313871aae1a9d3492c15e2a39ae8213a1144 Mon Sep 17 00:00:00 2001 From: 2swo Date: Fri, 15 Mar 2024 17:24:44 +0900 Subject: [PATCH 5/7] =?UTF-8?q?refactor(#363)=20docker-compose=20=ED=99=95?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c62002d6..99402c1f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,7 +15,7 @@ services: - redis_data:/usr/local/etc/redis command: sh -c "redis-server /usr/local/etc/redis/redis.conf" env_file: - - .redis.env + - .env.redis ports: - '6379:6379' restart: always @@ -26,7 +26,20 @@ services: - '80:80' - '443:443' env_file: - - .nginx-certbot.env + - .env.nginx-certbot + + # mysql 이미지는 따로 dockerfile로 빌드되진 않습니다. + # version과 port,env파일명,command 참고하시면 될 것 같습니다. + # development_db: + # image: mysql:8.0.36 + # restart: unless-stopped + # ports: + # - '3306:3306' + # env_file: + # - .env.mysql + # command: + # - --character-set-server=utf8mb4 + # - --collation-server=utf8mb4_unicode_ci volumes: redis_data: From e6a19d24313875ca605701da99ee73cdb4497fe4 Mon Sep 17 00:00:00 2001 From: 2swo Date: Fri, 15 Mar 2024 17:34:52 +0900 Subject: [PATCH 6/7] =?UTF-8?q?refactor(#363)=20.gitignore=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 81e6e39b..fab97752 100644 --- a/.gitignore +++ b/.gitignore @@ -76,6 +76,8 @@ web_modules/ .env.local .env.development .env.production +.env.redis +.env.nginx-certbot # parcel-bundler cache (https://parceljs.org/) .cache From e446045608d6231793451b968ecff2774a420ffe Mon Sep 17 00:00:00 2001 From: 2swo Date: Fri, 15 Mar 2024 17:46:00 +0900 Subject: [PATCH 7/7] =?UTF-8?q?refactor(#363)=20.gitignore=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index fab97752..f29c96a0 100644 --- a/.gitignore +++ b/.gitignore @@ -78,6 +78,7 @@ web_modules/ .env.production .env.redis .env.nginx-certbot +.env.mysql # parcel-bundler cache (https://parceljs.org/) .cache