From 17241ab9d9e17863ccf4006776e2ea3bb20e4390 Mon Sep 17 00:00:00 2001 From: songhaechan Date: Wed, 19 Jun 2024 12:02:44 +0900 Subject: [PATCH] test --- .github/workflows/deploy.yml | 20 ++++++++-------- docker-compose.yml | 44 ++++++++++++++++++------------------ 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 979c1c2..6d5d691 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -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/ssh-action@v1.0.0 @@ -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 \ No newline at end of file + 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 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 991e56c..2e8b663 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 \ No newline at end of file +# - prometheus \ No newline at end of file