From ee917b1dbb02b7cdc127795618f3d5c3238b000b Mon Sep 17 00:00:00 2001
From: Sewook <sewook0303@dgsw.hs.kr>
Date: Mon, 26 Aug 2024 16:54:05 +0900
Subject: [PATCH] deploy

---
 .github/workflows/azure-dev.yml      | 26 ++++++++++++--------------
 .idea/material_theme_project_new.xml |  5 +----
 Dockerfile                           |  8 ++++++++
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/azure-dev.yml b/.github/workflows/azure-dev.yml
index 4995336..f36aeeb 100644
--- a/.github/workflows/azure-dev.yml
+++ b/.github/workflows/azure-dev.yml
@@ -20,6 +20,9 @@ jobs:
       AZURE_RESOURCE_GROUP: ${{ vars.AZURE_RESOURCE_GROUP }}
       AZURE_LOCATION: ${{ vars.AZURE_LOCATION }}
       AZURE_ENV_NAME: ${{ vars.AZURE_ENV_NAME }}
+      DATABASE_URL: ${{ secrets.DB_URL }}
+      DATABASE_USER: ${{ secrets.DB_USERNAME }}
+      DATABASE_PASSWORD: ${{ secrets.DB_PASSWORD }}
 
     steps:
       - name: Checkout
@@ -31,15 +34,6 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
 
-      - name: Set yml file
-        uses: microsoft/variable-substitution@v1
-        with:
-          files: src/main/resources/application.yaml
-        env:
-          spring.datasource.url: ${{ secrets.DB_URL }}
-          spring.datasource.username: ${{ secrets.DB_USERNAME }}
-          spring.datasource.password: ${{ secrets.DB_PASSWORD }}
-
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
@@ -49,7 +43,10 @@ jobs:
       - name: Docker build
         run: |
           echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
-          docker build -t ${{ secrets.DOCKER_USERNAME }}/uiseong-come-on .
+          docker build -t ${{ secrets.DOCKER_USERNAME }}/uiseong-come-on \
+            --build-arg DATABASE_URL=${{ secrets.DB_URL }} \
+            --build-arg DATABASE_USER=${{ secrets.DB_USERNAME }} \
+            --build-arg DATABASE_PASSWORD=${{ secrets.DB_PASSWORD }} .
           docker push ${{ secrets.DOCKER_USERNAME }}/uiseong-come-on:latest
 
       - name: Install azd
@@ -58,10 +55,11 @@ jobs:
       - name: Log in with Azure (Federated Credentials)
         if: ${{ env.AZURE_CLIENT_ID != '' }}
         run: |
-          azd auth login \
-            --client-id "${{ env.AZURE_CLIENT_ID }}" \
-            --federated-credential-provider "github" \
-            --tenant-id "${{ env.AZURE_TENANT_ID }}"
+          azd auth login `
+            --client-id "$Env:AZURE_CLIENT_ID" `
+            --federated-credential-provider "github" `
+            --tenant-id "$Env:AZURE_TENANT_ID"
+        shell: pwsh
 
       - name: Log in with Azure (Client Credentials)
         if: ${{ env.AZURE_CREDENTIALS != '' }}
diff --git a/.idea/material_theme_project_new.xml b/.idea/material_theme_project_new.xml
index 34eeb92..e88bcfd 100644
--- a/.idea/material_theme_project_new.xml
+++ b/.idea/material_theme_project_new.xml
@@ -3,10 +3,7 @@
   <component name="MaterialThemeProjectNewConfig">
     <option name="metadata">
       <MTProjectMetadataState>
-        <option name="migrated" value="true" />
-        <option name="pristineConfig" value="false" />
-        <option name="userId" value="-4f17548e:18a01d64212:-8000" />
-        <option name="version" value="8.13.2" />
+        <option name="userId" value="78b34205:1918d279161:-7e42" />
       </MTProjectMetadataState>
     </option>
   </component>
diff --git a/Dockerfile b/Dockerfile
index 993989d..e31ff98 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,13 @@
 FROM openjdk:latest
 
+ARG DATABASE_URL
+ARG DATABASE_USER
+ARG DATABASE_PASSWORD
+
+ENV DATABASE_URL=$DATABASE_URL
+ENV DATABASE_USERNAME=$DATABASE_USER
+ENV DATABASE_PASSWORD=$DATABASE_PASSWORD
+
 COPY ../build/libs/chapterTwo-0.0.1-SNAPSHOT.jar /app/app.jar
 
 ENTRYPOINT ["java", "-jar", "/app/app.jar"]
\ No newline at end of file