Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Synchronize develop Branch #91

Merged
merged 8 commits into from
Aug 23, 2024
Merged

Synchronize develop Branch #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5057b78
Merge pull request #48 from dnd-side-project/develop
apptie Aug 11, 2024
2e2c001
Merge pull request #83 from dnd-side-project/develop
miraexhoi Aug 21, 2024
c41e38f
!hotfix :: add cors setting and change username
miraexhoi Aug 22, 2024
cfcb451
!hotfix :: change allowed origin to secret
miraexhoi Aug 23, 2024
060859d
Merge pull request #85 from dnd-side-project/hotfix/#84
miraexhoi Aug 23, 2024
8a6bc20
!hotfix :: fix docker file
miraexhoi Aug 23, 2024
567b8ea
!hotfix :: fix jar file name info
miraexhoi Aug 23, 2024
35d93a3
Merge pull request #87 from dnd-side-project/hotfix/#86
miraexhoi Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/backend-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ jobs:
run: |
mkdir -p ./src/main/resources
echo "${{ secrets.APPLICATION_PROD }}" > ./src/main/resources/application-prod.yml
echo "cors:" >> ./src/main/resources/application-prod.yml
echo " allowed-origin: ${{ secrets.ALLOWED_ORIGIN }}" >> ./src/main/resources/application-prod.yml
echo " max-age: 2400" >> ./src/main/resources/application-prod.yml

- name: Set executable permission
run: chmod +x ./gradlew
Expand All @@ -38,12 +41,12 @@ jobs:
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.HOST_PROD }}
username: ec2-user
username: ubuntu
key: ${{ secrets.PRIVATE_KEY }}
envs: GITHUB_SHA
script: |
sudo docker stop spaced
sudo docker rm spaced
sudo docker stop spaced || true
sudo docker rm spaced || true
sudo docker rmi ${{ secrets.DOCKER_USERNAME }}/spaced:0.0.1-SNAPSHOT
sudo docker pull ${{ secrets.DOCKER_USERNAME }}/spaced:0.0.1-SNAPSHOT
sudo docker run -d -p 8080:8080 --name spaced ${{ secrets.DOCKER_USERNAME }}/spaced:0.0.1-SNAPSHOT \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM openjdk:17
ARG JAR_FILE=build/libs/*.jar
ARG JAR_FILE=build/libs/spaced-0.0.1-SNAPSHOT.jar
COPY ${JAR_FILE} app.jar
ENV TZ=Asia/Seoul
ENTRYPOINT ["java","-jar","/app.jar","-Duser.timezone=Asia/Seoul"]
ENTRYPOINT ["java", "-Dspring.profiles.active=prod", "-Duser.timezone=Asia/Seoul", "-jar", "/app.jar"]
Loading