Skip to content

Commit a6a9728

Browse files
committed
[fix] prod, dev 이미지 생성시 이름 다르게
1 parent ee4da95 commit a6a9728

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

.github/workflows/CD-dev.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ jobs:
3333
3434
./gradlew clean build
3535
docker rm -f moplus-server-dev --force
36-
docker rmi moplus_server_back
37-
docker-compose -f docker-compose-dev.yml up --build -d
36+
docker rmi moplus_server_dev
37+
docker-compose -f docker-compose-dev.yml -p moplus-dev up --build -d

.github/workflows/CD-prod.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ jobs:
1616
script: |
1717
cd ~/moplus_server
1818
kill -9 $(lsof -t -i :8081)
19-
git add ../
19+
git checkout master
20+
git add .
2021
git commit -m "temp commit"
2122
git fetch origin master
2223
git merge origin/master
@@ -31,6 +32,6 @@ jobs:
3132
3233
./gradlew clean build
3334
docker rm -f moplus_server_prod --force
34-
docker rmi moplus_server_back
35-
docker-compose -f docker-compose-prod.yml up --build -d
35+
docker rmi moplus_server_prod
36+
docker-compose -f docker-compose-prod.yml -p moplus-prod up --build -d
3637

docker-compose-dev.yml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ services:
44
context: .
55
dockerfile: Dockerfile
66
container_name: moplus-server-dev
7+
image: moplus-backend-dev
78
restart: always
89
ports:
910
- 8081:8080

docker-compose-prod.yml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ services:
44
context: .
55
dockerfile: Dockerfile.prod
66
container_name: moplus-server-prod
7+
image: moplus-backend-prod
78
restart: always
89
ports:
910
- 8080:8080

0 commit comments

Comments
 (0)