File tree 4 files changed +8
-5
lines changed
4 files changed +8
-5
lines changed Original file line number Diff line number Diff line change 33
33
34
34
./gradlew clean build
35
35
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
Original file line number Diff line number Diff line change 16
16
script : |
17
17
cd ~/moplus_server
18
18
kill -9 $(lsof -t -i :8081)
19
- git add ../
19
+ git checkout master
20
+ git add .
20
21
git commit -m "temp commit"
21
22
git fetch origin master
22
23
git merge origin/master
31
32
32
33
./gradlew clean build
33
34
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
36
37
Original file line number Diff line number Diff line change @@ -4,6 +4,7 @@ services:
4
4
context : .
5
5
dockerfile : Dockerfile
6
6
container_name : moplus-server-dev
7
+ image : moplus-backend-dev
7
8
restart : always
8
9
ports :
9
10
- 8081:8080
Original file line number Diff line number Diff line change @@ -4,6 +4,7 @@ services:
4
4
context : .
5
5
dockerfile : Dockerfile.prod
6
6
container_name : moplus-server-prod
7
+ image : moplus-backend-prod
7
8
restart : always
8
9
ports :
9
10
- 8080:8080
You can’t perform that action at this time.
0 commit comments