Merge branch 'develop' into fix/search-refactor-isValidDateRange

VentionCapstone · Jan 20, 2024 · d8f65e2 · d8f65e2
2 parents 6da3356 + 470fb9a
commit d8f65e2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/.env.example b/.env.example
@@ -2,6 +2,7 @@ DB_USER=username
 DB_PASSWORD=password
 DB_NAME=db_name
 DB_HOST=postgres # use 'localhost' if you are not using docker
+DB_PORT=5432
 
 DATABASE_URL="postgresql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:5432/${DB_NAME}?schema=public"
 

diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
@@ -63,7 +63,7 @@ jobs:
           key: ${{ secrets.EC2_PRIVATE_KEY }}
           port: ${{ secrets.EC2_PORT }}
           script: |
-            docker-compose down
-            docker-compose rm -f ${{env.DOCKER_CONTAINER_NAME}}
-            docker-compose pull ${{env.DOCKER_CONTAINER_NAME}}
-            docker-compose up -d ${{env.DOCKER_CONTAINER_NAME}}
+            docker compose down
+            docker compose rm -f ${{env.DOCKER_CONTAINER_NAME}}
+            docker compose pull ${{env.DOCKER_CONTAINER_NAME}}
+            docker compose up -d ${{env.DOCKER_CONTAINER_NAME}}
diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
@@ -63,7 +63,7 @@ jobs:
           key: ${{ secrets.EC2_PRIVATE_KEY }}
           port: ${{ secrets.EC2_PORT }}
           script: |
-            docker-compose down
-            docker-compose rm -f ${{env.DOCKER_CONTAINER_NAME}}
-            docker-compose pull ${{env.DOCKER_CONTAINER_NAME}}
-            docker-compose up -d ${{env.DOCKER_CONTAINER_NAME}}
+            docker compose down
+            docker compose rm -f ${{env.DOCKER_CONTAINER_NAME}}
+            docker compose pull ${{env.DOCKER_CONTAINER_NAME}}
+            docker compose up -d ${{env.DOCKER_CONTAINER_NAME}}
diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
@@ -13,6 +13,8 @@ services:
       POSTGRES_USER: ${DB_USER}
       POSTGRES_PASSWORD: ${DB_PASSWORD}
       POSTGRES_DB: ${DB_NAME}
+      POSTGRES_HOST: ${DB_HOST}
+      POSTGRES_PORT: ${DB_PORT}
     healthcheck:
       test: ['CMD-SHELL', 'pg_isready -U ${DB_USER} -d ${DB_NAME}']
       interval: 5s