Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/deploy-admin-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ jobs:
envs: AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_REGION
script: |
cd ${{ env.EC2_DEPLOY_PATH }}
sudo docker rm -f nowait-app-admin-api || true
sudo docker-compose -p nowait_dev pull nowait-app-admin-api
sudo docker-compose -p nowait_dev up -d nowait-app-admin-api

1 change: 1 addition & 0 deletions .github/workflows/deploy-user-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ jobs:
envs: AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_REGION
script: |
cd ${{ env.EC2_DEPLOY_PATH }}
sudo docker rm -f nowait-app-user-api || true
sudo docker-compose -p nowait_dev pull nowait-app-user-api
sudo docker-compose -p nowait_dev up -d nowait-app-user-api

3 changes: 1 addition & 2 deletions nowait-app-admin-api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ ARG JAR_FILE=./build/libs/*.jar
COPY ${JAR_FILE} nowait-app-admin-api.jar

ARG PROFILE=admin
ENV PROFILE=${PROFILE}

CMD ["java", "-jar", "nowait-app-admin-api.jar", "--spring.profiles.active=${PROFILE}", "-Djava.security.egd=file:/dev/./urandom", "-Duser.timezone=Asia/Seoul"]
CMD ["java", "-jar", "nowait-app-admin-api.jar", "--spring.profiles.active=admin", "-Djava.security.egd=file:/dev/./urandom", "-Duser.timezone=Asia/Seoul"]
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@ public static void main(String[] args) {
org.springframework.boot.SpringApplication.run(ApiAdminApplication.class, args);
}
}

3 changes: 1 addition & 2 deletions nowait-app-user-api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ ARG JAR_FILE=./build/libs/*.jar
COPY ${JAR_FILE} nowait-app-user-api.jar

ARG PROFILE=user
ENV PROFILE=${PROFILE}

CMD ["java", "-jar", "nowait-app-user-api.jar", "--spring.profiles.active=${PROFILE}", "-Djava.security.egd=file:/dev/./urandom", "-Duser.timezone=Asia/Seoul"]
CMD ["java", "-jar", "nowait-app-user-api.jar", "--spring.profiles.active=user", "-Djava.security.egd=file:/dev/./urandom", "-Duser.timezone=Asia/Seoul"]
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ public static void main(String[] args) {
SpringApplication.run(ApiUserApplication.class, args);
}
}