fix: 환경변수를 .env 파일로 저장

- EC2에 자동 pull 되도록 설정
- dokcer 레포 이름 올바르게 지정
- Docker이미지는 myusername/myapp:7자리 커밋 SHA로 태그가 저장되도록 함
- env 파일 .gitignore에 추가

.github/workflows/deploy.yml

@@ -34,8 +34,8 @@ jobs:
       - name: Build and push Docker image
         run: |
           docker build -t ${{ secrets.DOCKERHUB_REPOSITORY }} .
-          docker tag ${{ secrets.DOCKERHUB_REPOSITORY }} ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:${{ github.sha }}
-          docker push ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:${{ github.sha }}
+          docker tag ${{ secrets.DOCKERHUB_REPOSITORY }} ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:${{ github.sha::7 }}
+          docker push ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:${{ github.sha::7 }}
 
       - name: Deploy to EC2
         uses: appleboy/ssh-action@master
@@ -46,14 +46,14 @@ jobs:
           script: |
             cd ~/midpoint-backend && \
             git pull origin main && \
-            docker pull ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:${{ github.sha }} && \
-            export POSTGRES_DB=${{ secrets.POSTGRES_DB }} && \
-            export POSTGRES_USER=${{ secrets.POSTGRES_USER }} && \
-            export POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }} && \
-            export SPRING_DATASOURCE_URL=${{ secrets.SPRING_DATASOURCE_URL }} && \
-            export SPRING_DATASOURCE_USERNAME=${{ secrets.SPRING_DATASOURCE_USERNAME }} && \
-            export SPRING_DATASOURCE_PASSWORD=${{ secrets.SPRING_DATASOURCE_PASSWORD }} && \
-            export REDIS_HOST=${{ secrets.REDIS_HOST }} && \
-            export REDIS_PORT=${{ secrets.REDIS_PORT }} && \
-            export DOCKER_IMAGE=${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:${{ github.sha }} && \            
-            docker-compose up -d
+            docker pull ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:${{ github.sha::7 }} && \
+            echo "POSTGRES_DB=${{ secrets.POSTGRES_DB }}" > .env && \
+            echo "POSTGRES_USER=${{ secrets.POSTGRES_USER }}" >> .env && \
+            echo "POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}" >> .env && \
+            echo "SPRING_DATASOURCE_URL=${{ secrets.SPRING_DATASOURCE_URL }}" >> .env && \
+            echo "SPRING_DATASOURCE_USERNAME=${{ secrets.SPRING_DATASOURCE_USERNAME }}" >> .env && \
+            echo "SPRING_DATASOURCE_PASSWORD=${{ secrets.SPRING_DATASOURCE_PASSWORD }}" >> .env && \
+            echo "REDIS_HOST=${{ secrets.REDIS_HOST }}" >> .env && \
+            echo "REDIS_PORT=${{ secrets.REDIS_PORT }}" >> .env && \
+            echo "DOCKER_IMAGE=${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:${{ github.sha::7 }}" >> .env && \
+            docker-compose --env-file .env up -d

.gitignore

@@ -36,3 +36,6 @@ src/main/resources/application.yml
 
 ### VS Code ###
 .vscode/
+
+### Docker ###
+.env

docker-compose.yml

@@ -5,9 +5,9 @@ services:
     image: postgres:latest
     container_name: postgres
     environment:
-      POSTGRES_DB: ${POSTGRES_DB}
-      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      - POSTGRES_DB=${POSTGRES_DB}
+      - POSTGRES_USER=${POSTGRES_USER}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     ports:
       - "5432:5432"
 
@@ -23,11 +23,11 @@ services:
     ports:
       - "8080:8080"
     environment:
-      SPRING_DATASOURCE_URL: ${SPRING_DATASOURCE_URL}
-      SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME}
-      SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD}
-      SPRING_REDIS_HOST: ${REDIS_HOST}
-      SPRING_REDIS_PORT: ${REDIS_PORT}
+      - SPRING_DATASOURCE_URL=${SPRING_DATASOURCE_URL}
+      - SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME}
+      - SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD}
+      - SPRING_REDIS_HOST=${REDIS_HOST}
+      - SPRING_REDIS_PORT=${REDIS_PORT}
     depends_on:
       - postgres
       - redis