Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
songhaechan committed Jun 19, 2024
1 parent e33a3dc commit 17241ab
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 32 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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]
Expand All @@ -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
44 changes: 22 additions & 22 deletions docker-compose.yml
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

0 comments on commit 17241ab

Please sign in to comment.