-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #34 from SQUAD-D/feature#18/image-update
test
- Loading branch information
Showing
2 changed files
with
32 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -53,8 +53,8 @@ jobs: | |
- name: docker image build WAS-01 | ||
run: docker build -t haechansomg/simple-board:was01 -f ./dockerFile-was01 . | ||
|
||
- name: docker image build WAS-02 | ||
run: docker build -t haechansomg/simple-board2:was02 -f ./dockerFile-was02 . | ||
# - name: docker image build WAS-02 | ||
# run: docker build -t haechansomg/simple-board2:was02 -f ./dockerFile-was02 . | ||
|
||
# DockerHub Login | ||
- name: docker login | ||
|
@@ -67,9 +67,9 @@ jobs: | |
- name: docker Hub push WAS-01 | ||
run: docker push haechansomg/simple-board:was01 | ||
|
||
# Docker Hub push | ||
- name: docker Hub push WAS-02 | ||
run: docker push haechansomg/simple-board2:was02 | ||
# # Docker Hub push | ||
# - name: docker Hub push WAS-02 | ||
# run: docker push haechansomg/simple-board2:was02 | ||
|
||
- name: Deploy to server | ||
uses: appleboy/[email protected] | ||
|
@@ -83,8 +83,8 @@ jobs: | |
envs: COMPOSE | ||
port: 22 | ||
script: | | ||
sudo docker-compose -f $COMPOSE down --rmi all | ||
sudo docker pull haechansomg/simple-board:was01 | ||
sudo docker pull haechansomg/simple-board2:was02 | ||
sudo docker-compose -f $COMPOSE up -d | ||
sudo docker image prune -f | ||
sudo docker-compose -f $COMPOSE down --rmi all | ||
sudo docker pull haechansomg/simple-board:was01 | ||
# sudo docker pull haechansomg/simple-board2:was02 | ||
sudo docker-compose -f $COMPOSE up -d | ||
sudo docker image prune -f |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,37 +1,37 @@ | ||
version: '3' | ||
services: | ||
grafana: | ||
image: grafana/grafana | ||
ports: | ||
- 3000:3000 | ||
prometheus: | ||
image: prom/prometheus | ||
ports: | ||
- 9090:9090 | ||
volumes: | ||
- ./prometheus.yml:/etc/prometheus/prometheus.yml:ro | ||
# grafana: | ||
# image: grafana/grafana | ||
# ports: | ||
# - 3000:3000 | ||
# prometheus: | ||
# image: prom/prometheus | ||
# ports: | ||
# - 9090:9090 | ||
# volumes: | ||
# - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro | ||
spring_app1: | ||
container_name: Spring-Tomcat-1 | ||
image: haechansomg/simple-board:was01 | ||
ports: | ||
- 8080:8080 | ||
spring_app2: | ||
container_name: Spring-Tomcat-2 | ||
image: haechansomg/simple-board2:was02 | ||
ports: | ||
- 8081:8081 | ||
# spring_app2: | ||
# container_name: Spring-Tomcat-2 | ||
# image: haechansomg/simple-board2:was02 | ||
# ports: | ||
# - 8081:8081 | ||
redis: | ||
image: "redis:latest" | ||
container_name: redis | ||
hostname: redis | ||
ports: | ||
- 6379:6379 | ||
redis-exporter: | ||
image: oliver006/redis_exporter | ||
ports: | ||
- 9121:9121 | ||
environment: | ||
REDIS_ADDR: "redis:6379" | ||
# redis-exporter: | ||
# image: oliver006/redis_exporter | ||
# ports: | ||
# - 9121:9121 | ||
# environment: | ||
# REDIS_ADDR: "redis:6379" | ||
links: | ||
- redis | ||
- prometheus | ||
# - prometheus |