Skip to content

dev -> main #995

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

Merged
mjKim1229 merged 3 commits into from
Nov 7, 2025
Merged

dev -> main #995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0562e0c
docker file
mjKim1229 Nov 7, 2025
15e383c
.
mjKim1229 Nov 7, 2025
6e91f78
.
mjKim1229 Nov 7, 2025
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
2 changes: 1 addition & 1 deletion Clubber-External/Dockerfile.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:17-alpine
FROM eclipse-temurin:17-jdk-alpine

# curl 설치
RUN apk add --no-cache curl
Expand Down
2 changes: 1 addition & 1 deletion Clubber-External/Dockerfile.prod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:17-alpine
FROM eclipse-temurin:17-jdk-alpine

ARG JAR_FILE=build/libs/Clubber-External.jar

Expand Down
6 changes: 3 additions & 3 deletions Clubber-Internal/Dockerfile.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM openjdk:17-alpine
FROM eclipse-temurin:17-jdk-alpine

# curl 설치
RUN apk add --no-cache curl

ARG JAR_FILE=build/libs/Clubber-Internal.jar

COPY ${JAR_FILE} app.jar

ARG PROFILE=dev
ENV PROFILE=${PROFILE}

ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=${PROFILE}","/app.jar"]
ENTRYPOINT ["java", "-Dspring.profiles.active=${PROFILE}", "-jar", "/app.jar"]
4 changes: 2 additions & 2 deletions Clubber-Internal/Dockerfile.prod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM openjdk:17-alpine
FROM eclipse-temurin:17-jdk-alpine

ARG JAR_FILE=build/libs/Clubber-Internal.jar
ARG JAR_FILE=build/libs/Clubber-External.jar

COPY ${JAR_FILE} app.jar
ARG PROFILE=prod
Expand Down