diff --git a/.github/workflows/CD-develop.yml b/.github/workflows/CD-develop.yml index e047b022..a988d5b4 100644 --- a/.github/workflows/CD-develop.yml +++ b/.github/workflows/CD-develop.yml @@ -30,6 +30,13 @@ jobs: shell: bash - name: Build with Gradle + env: + DEV_DB_NAME: ${{ secrets.DEV_DB_NAME }} + DEV_DB_PWD: ${{ secrets.DEV_DB_PWD }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + DEV_APPLE_KEY_NAME: ${{ secrets.DEV_APPLE_KEY_NAME }} + S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }} + S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }} run: ./gradlew build -x test -Dspring.profiles.active=dev shell: bash @@ -54,10 +61,18 @@ jobs: steps: - name: Run Docker container uses: appleboy/ssh-action@master + env: + DEV_DB_NAME: ${{ secrets.DEV_DB_NAME }} + DEV_DB_PWD: ${{ secrets.DEV_DB_PWD }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + DEV_APPLE_KEY_NAME: ${{ secrets.DEV_APPLE_KEY_NAME }} + S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }} + S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }} with: host: ${{ secrets.DEVELOP_SERVER_IP }} username: ${{ secrets.DEVELOP_SERVER_USER }} key: ${{ secrets.DEVELOP_SERVER_KEY }} + envs: DEV_DB_NAME,DEV_DB_PWD,APPLE_TEAM_ID,DEV_APPLE_KEY_NAME,S3_ACCESS_KEY,S3_SECRET_KEY script: | cd ~ ./deploy.sh diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 4021c197..1179b362 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -30,6 +30,13 @@ jobs: shell: bash - name: Build with Gradle + env: + PROD_DB_NAME: ${{ secrets.PROD_DB_NAME }} + PROD_DB_PWD: ${{ secrets.PROD_DB_PWD }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + PROD_APPLE_KEY_NAME: ${{ secrets.PROD_APPLE_KEY_NAME }} + S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }} + S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }} run: ./gradlew build -x test -Dspring.profiles.active=prod shell: bash @@ -54,10 +61,18 @@ jobs: steps: - name: Run Docker container uses: appleboy/ssh-action@master + env: + PROD_DB_NAME: ${{ secrets.PROD_DB_NAME }} + PROD_DB_PWD: ${{ secrets.PROD_DB_PWD }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + PROD_APPLE_KEY_NAME: ${{ secrets.PROD_APPLE_KEY_NAME }} + S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }} + S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }} with: host: ${{ secrets.RELEASE_SERVER_IP }} username: ${{ secrets.RELEASE_SERVER_USER }} key: ${{ secrets.RELEASE_SERVER_KEY }} + envs: PROD_DB_NAME,PROD_DB_PWD,APPLE_TEAM_ID,PROD_APPLE_KEY_NAME,S3_ACCESS_KEY,S3_SECRET_KEY script: | cd ~ ./deploy.sh diff --git a/.github/workflows/CI-develop.yml b/.github/workflows/CI-develop.yml index 6e4cb6b9..123f48b7 100644 --- a/.github/workflows/CI-develop.yml +++ b/.github/workflows/CI-develop.yml @@ -30,5 +30,12 @@ jobs: shell: bash - name: Build with Gradle + env: + DEV_DB_NAME: ${{ secrets.DEV_DB_NAME }} + DEV_DB_PWD: ${{ secrets.DEV_DB_PWD }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + DEV_APPLE_KEY_NAME: ${{ secrets.DEV_APPLE_KEY_NAME }} + S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }} + S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }} run: ./gradlew build -x test shell: bash \ No newline at end of file diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 3e1a5044..58173298 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -30,5 +30,12 @@ jobs: shell: bash - name: Build with Gradle + env: + PROD_DB_NAME: ${{ secrets.PROD_DB_NAME }} + PROD_DB_PWD: ${{ secrets.PROD_DB_PWD }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + PROD_APPLE_KEY_NAME: ${{ secrets.PROD_APPLE_KEY_NAME }} + S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }} + S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }} run: ./gradlew build -x test - shell: bash + shell: bash \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index aa8f9ff6..1245deee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,10 @@ FROM amd64/amazoncorretto:17 WORKDIR /app COPY config-repo/ /app/config-repo/ +RUN test -f /app/config-repo/application-dev.yml \ + && test -f /app/config-repo/application-prod.yml \ + && test -f /app/config-repo/application-common.yml COPY ./build/libs/WSS-Server-0.0.1-SNAPSHOT.jar /app/websoso.jar -ENTRYPOINT ["java", "-Duser.timezone=Asia/Seoul", "-Dspring.profiles.active=${SPRING_PROFILES_ACTIVE}", "-jar", "websoso.jar"] +ENTRYPOINT ["java", "-Duser.timezone=Asia/Seoul", "-jar", "websoso.jar"] \ No newline at end of file