diff --git a/configs/common.dev b/configs/common.dev index 53c3c15..0d12a34 100644 --- a/configs/common.dev +++ b/configs/common.dev @@ -3,7 +3,7 @@ package config const ( BASE_URL = "https://learnsteam-quiz-api.jongyeob.com" PORT = ":3030" - DATABASE_URL = "root:fbOgZ6Xxn5VXBYihjqygRXyaK6ZUgKL6@tcp(db:3306)/learnsteam_quiz?charset=utf8&parseTime=True&loc=Local" + DATABASE_URL = "root:fbOgZ6Xxn5VXBYihjqygRXyaK6ZUgKL6@tcp(learnsteam-quiz-db:3306)/learnsteam_quiz?charset=utf8&parseTime=True&loc=Local" KAKAO_CLIENT_ID = "986830" KAKAO_CLIENT_SECRET = "14f63a8e91c4e0fe88bc40e3ff348233" diff --git a/configs/common.local b/configs/common.local index 5a3687c..6d3914c 100644 --- a/configs/common.local +++ b/configs/common.local @@ -4,7 +4,7 @@ const ( BASE_URL = "http://localhost:3030" PORT = ":3030" //DATABASE_URL = "learnsteam:fbOgZ6Xxn5VXBYihjqygRXyaK6ZUgKL6@tcp(localhost:3306)/learnsteam_quiz?charset=utf8&parseTime=True&loc=Local" - DATABASE_URL = "root:fbOgZ6Xxn5VXBYihjqygRXyaK6ZUgKL6@tcp(db:3306)/learnsteam_quiz?charset=utf8&parseTime=True&loc=Local" + DATABASE_URL = "root:fbOgZ6Xxn5VXBYihjqygRXyaK6ZUgKL6@tcp(learnsteam-quiz-db:3306)/learnsteam_quiz?charset=utf8&parseTime=True&loc=Local" KAKAO_CLIENT_ID = "986830" KAKAO_CLIENT_SECRET = "14f63a8e91c4e0fe88bc40e3ff348233" diff --git a/configs/common.prod b/configs/common.prod index 53c3c15..0d12a34 100644 --- a/configs/common.prod +++ b/configs/common.prod @@ -3,7 +3,7 @@ package config const ( BASE_URL = "https://learnsteam-quiz-api.jongyeob.com" PORT = ":3030" - DATABASE_URL = "root:fbOgZ6Xxn5VXBYihjqygRXyaK6ZUgKL6@tcp(db:3306)/learnsteam_quiz?charset=utf8&parseTime=True&loc=Local" + DATABASE_URL = "root:fbOgZ6Xxn5VXBYihjqygRXyaK6ZUgKL6@tcp(learnsteam-quiz-db:3306)/learnsteam_quiz?charset=utf8&parseTime=True&loc=Local" KAKAO_CLIENT_ID = "986830" KAKAO_CLIENT_SECRET = "14f63a8e91c4e0fe88bc40e3ff348233" diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index 5db7010..580833b 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: - db: + learnsteam-quiz-db: image: mysql:latest environment: MYSQL_ROOT_PASSWORD: fbOgZ6Xxn5VXBYihjqygRXyaK6ZUgKL6 @@ -10,7 +10,7 @@ services: - "33061:3306" volumes: - db-learnsteam:/var/lib/mysql - app: + learnsteam-quiz-api: build: context: ../../ dockerfile: docker/dev/Dockerfile @@ -18,13 +18,13 @@ services: ports: - "3030:3030" environment: - DB_HOST: db + DB_HOST: learnsteam-quiz-db DB_PORT: 3306 DB_USER: root DB_PASSWORD: fbOgZ6Xxn5VXBYihjqygRXyaK6ZUgKL6 DB_NAME: learnsteam_quiz depends_on: - - db + - learnsteam-quiz-db restart: always volumes: db-learnsteam: diff --git a/docker/local/docker-compose.yml b/docker/local/docker-compose.yml index df71d88..1f6973b 100644 --- a/docker/local/docker-compose.yml +++ b/docker/local/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: - db: + learnsteam-quiz-db: image: mysql:latest environment: MYSQL_ROOT_PASSWORD: fbOgZ6Xxn5VXBYihjqygRXyaK6ZUgKL6 @@ -10,7 +10,7 @@ services: - "3306:3306" volumes: - db-learnsteam:/var/lib/mysql - app: + learnsteam-quiz-api: build: context: ../../ dockerfile: docker/local/Dockerfile @@ -18,9 +18,9 @@ services: ports: - "3030:3030" depends_on: - - db + - learnsteam-quiz-db environment: - DB_HOST: db + DB_HOST: learnsteam-quiz-db DB_PORT: 3306 DB_USER: root DB_PASSWORD: fbOgZ6Xxn5VXBYihjqygRXyaK6ZUgKL6 diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 173b4b7..77374a3 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: - db: + learnsteam-quiz-db: image: mysql:latest environment: MYSQL_ROOT_PASSWORD: fbOgZ6Xxn5VXBYihjqygRXyaK6ZUgKL6 @@ -10,7 +10,7 @@ services: - "33061:3306" volumes: - db-learnsteam:/var/lib/mysql - app: + learnsteam-quiz-api: build: context: ../../ dockerfile: docker/prod/Dockerfile @@ -18,13 +18,13 @@ services: ports: - "3030:3030" environment: - DB_HOST: db + DB_HOST: learnsteam-quiz-db DB_PORT: 3306 DB_USER: root DB_PASSWORD: fbOgZ6Xxn5VXBYihjqygRXyaK6ZUgKL6 DB_NAME: learnsteam_quiz depends_on: - - db + - learnsteam-quiz-db restart: always volumes: db-learnsteam: