ci: refactoring ci files

felipeversiane · Jun 2, 2024 · 693be71 · 693be71
1 parent 37d92a1
commit 693be71
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 32 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -6,25 +6,26 @@ on:
   pull_request:
     branches: [ main ]
 
-env:
-  PORT: ${{ secrets.PORT }}
-  GIN_MODE: ${{ secrets.GIN_MODE }}
-  JWT_SECRET_KEY: ${{ secrets.JWT_SECRET_KEY }}
-  JWT_SECRET_REFRESH_KEY: ${{ secrets.JWT_SECRET_REFRESH_KEY }}
-  LOG_LEVEL: ${{ secrets.LOG_LEVEL }}
-  LOG_OUTPUT: ${{ secrets.LOG_OUTPUT }}
-  AUTHORIZATION_URL: ${{ secrets.AUTHORIZATION_URL }}
-  POSTGRES_HOST: ${{ secrets.POSTGRES_HOST }}
-  POSTGRES_PORT: ${{ secrets.POSTGRES_PORT }}
-  POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
-  POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
-  POSTGRES_DB: ${{ secrets.POSTGRES_DB }}
-  POSTGRES_URL: ${{ secrets.POSTGRES_URL }}
-
 jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
+    - name: Create .env file
+      run: |
+        echo "PORT=${{ secrets.PORT }}" >> .env
+        echo "GIN_MODE=${{ secrets.GIN_MODE }}" >> .env
+        echo "JWT_SECRET_KEY=${{ secrets.JWT_SECRET_KEY }}" >> .env
+        echo "JWT_SECRET_REFRESH_KEY=${{ secrets.JWT_SECRET_REFRESH_KEY }}" >> .env
+        echo "LOG_LEVEL=${{ secrets.LOG_LEVEL }}" >> .env
+        echo "LOG_OUTPUT=${{ secrets.LOG_OUTPUT }}" >> .env
+        echo "AUTHORIZATION_URL=${{ secrets.AUTHORIZATION_URL }}" >> .env
+        echo "POSTGRES_HOST=${{ secrets.POSTGRES_HOST }}" >> .env
+        echo "POSTGRES_PORT=${{ secrets.POSTGRES_PORT }}" >> .env
+        echo "POSTGRES_USER=${{ secrets.POSTGRES_USER }}" >> .env
+        echo "POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}" >> .env
+        echo "POSTGRES_DB=${{ secrets.POSTGRES_DB }}" >> .env
+        echo "POSTGRES_URL=${{ secrets.POSTGRES_URL }}" >> .env
+
     - uses: actions/checkout@v3
 
     - name: Set up Go
@@ -37,7 +38,7 @@ jobs:
 
     - name: Test
       run: go test -v ./internal/...
-  
+
   check:
     needs: build
     runs-on: ubuntu-22.04
@@ -66,4 +67,4 @@ jobs:
 
     - name: Tear Down
       if: always()
-      run: docker-compose down
+      run: docker-compose down
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -3,21 +3,18 @@ version: '3.0'
 services:
   db:
     container_name: pg01
+    env_file: .env
     build:
       context: .
       dockerfile: build/db/Dockerfile
     volumes:
       - local_postgres_data:/var/lib/postgresql/data
     ports:
-      - "${POSTGRES_PORT}:${POSTGRES_PORT}"
+      - "$POSTGRES_PORT:$POSTGRES_PORT"
     networks:
       - golangnetwork
-    environment:
-      POSTGRES_DB: ${POSTGRES_DB}
-      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -q -d ${POSTGRES_DB} -U ${POSTGRES_USER} || exit 1"]
+      test: ["CMD-SHELL", "pg_isready -q -d $POSTGRES_DB -U $POSTGRES_USER || exit 1"]
       interval: 10s
       timeout: 5s
       retries: 3
@@ -28,7 +25,7 @@ services:
     container_name: mg01
     volumes:
       - ./migrations:/migrations
-    command: ["-path", "/migrations", "-database", "${POSTGRES_URL}", "up"]
+    command: ["-path", "/migrations", "-database",  "${POSTGRES_URL}" , "up"]
     depends_on:
       db:
         condition: service_healthy
@@ -42,20 +39,14 @@ services:
     image: app
     container_name: go01
     restart: unless-stopped
+    env_file: .env
     ports:
-      - "${PORT}:${PORT}"
+      - "$PORT:$PORT"
     depends_on:
       - db
       - migrate
     networks:
       - golangnetwork
-    environment:
-      PORT: ${PORT}
-      GIN_MODE: ${GIN_MODE}
-      LOG_LEVEL: ${LOG_LEVEL}
-      LOG_OUTPUT: ${LOG_OUTPUT}
-      AUTHORIZATION_URL: ${AUTHORIZATION_URL}
-      POSTGRES_URL: ${POSTGRES_URL}
 
 volumes:
   local_postgres_data: {}