From 669779595e3b9c7a4f63ea45c2e32d6f729a0ff9 Mon Sep 17 00:00:00 2001 From: EunChanNam Date: Wed, 29 Nov 2023 13:26:09 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20yml=20=EC=84=A4=EC=A0=95=20=EC=98=A4?= =?UTF-8?q?=ED=83=88=EC=9E=90=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd.yml | 26 +++++++++++++------------- docker/docker-compose.yml | 4 +++- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 3b85edd..df9635b 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -45,20 +45,20 @@ jobs: source: "./.env" target: "./" - - name: ubuntu Docker image build and push - run: | - docker-compose -f ./docker/docker-compose.yml build - docker-compose -f ./docker/docker-compose.yml push -# - name: ubuntu Docker image build -# run: docker build -t ${{ secrets.DOCKER_NAME }}/we-share-wish-hair:latest -f Dockerfile-server . -# -# - name: Redis Docker image build -# run: docker build -t ${{ secrets.DOCKER_NAME }}/we-share-wish-hair:redis -f Dockerfile-redis . +# - name: ubuntu Docker image build and push +# run: | +# docker-compose -f ./docker/docker-compose.yml build +# docker-compose -f ./docker/docker-compose.yml push + - name: ubuntu Docker image build + run: docker build -t ${{ secrets.DOCKER_NAME }}/we-share-wish-hair:latest -f Dockerfile-server . -# - name: ubuntu docker Hub 푸쉬 -# run: docker push ${{ secrets.DOCKER_NAME }}/we-share-wish-hair:latest -# - name: Redis docker Hub 푸쉬 -# run: docker push ${{ secrets.DOCKER_NAME }}/we-share-wish-hair:redis + - name: Redis Docker image build + run: docker build -t ${{ secrets.DOCKER_NAME }}/we-share-wish-hair:redis -f Dockerfile-redis . + + - name: ubuntu docker Hub 푸쉬 + run: docker push ${{ secrets.DOCKER_NAME }}/we-share-wish-hair:latest + - name: Redis docker Hub 푸쉬 + run: docker push ${{ secrets.DOCKER_NAME }}/we-share-wish-hair:redis - name: Deploy with push uses: appleboy/ssh-action@v1.0.0 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index fe0e49a..ab6e079 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -5,9 +5,11 @@ services: context: ./ dockerfile: server/Dockerfile-server image: eunchannam/we-share-wish-hair:latest + platform: linux/amd64 redis: build: context: ./ dockerfile: redis/Dockerfile-redis - image: eunchannam/we-share-wish-hair:redis \ No newline at end of file + image: eunchannam/we-share-wish-hair:redis + platform: linux/amd64