Merge pull request #73 from Favor-Gift-Reminder/juwon/#56

[Fix] workflow 및 컨테이너 빌드 설정 수정 - #56
Favor-Gift-Reminder · Sep 10, 2023 · 50673a9 · 50673a9
2 parents 0cca3c9 + 35c2006
commit 50673a9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/.github/workflows/gradle-ci.yml b/.github/workflows/gradle-ci.yml
@@ -1,7 +1,7 @@
 name: Gradle CI
 
 on:
-  push:
+  pull_request:
     branches:
       - main
 
@@ -22,8 +22,10 @@ jobs:
           java-version: '11'
           distribution: 'temurin'
 
-      - name: Create application.yml
+      - name: Create properties
         run: |
+          cd favor
+          echo "${{ secrets.GRADLE_PROPERTIES_CONTENT }}" > gradle.properties
           mkdir -p src/main/resources
           echo "${{ secrets.APPLICATION_YML_CONTENT }}" > src/main/resources/application.yml
 

diff --git a/.github/workflows/gradle-cicd.yml b/.github/workflows/gradle-cicd.yml
@@ -35,9 +35,6 @@ jobs:
           chmod +x gradlew
 
       - name: Build with Gradle
-        env:
-            DOCKERHUB_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-            DOCKERHUB_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
         run: |
           cd favor
           ./gradlew jib

diff --git a/favor/build.gradle b/favor/build.gradle
@@ -26,12 +26,6 @@ jib {
     }
     from {
         image = "eclipse-temurin:11-jre"
-        platforms {
-            platform {
-                architecture = "arm64"
-                os = "linux"
-            }
-        }
         auth {
             username = project.findProperty('DockerUsername')
             password = project.findProperty('DockerPassword')