From 2a2f8a62d3118fd5af465fa999333f58eb641f95 Mon Sep 17 00:00:00 2001 From: rbwo552 Date: Mon, 19 Aug 2024 19:52:56 +0900 Subject: [PATCH] update docker-compose-dev.yml --- .github/workflows/cd.yml | 10 +++++----- docker-compose-dev.yml | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index deb99db..b1cb681 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -33,16 +33,16 @@ jobs: file: ./Dockerfile push: true tags: | - ${{ secrets.NCP_CONTAINER_REGISTRY }}/customk:${{ github.run_number }} - ${{ secrets.NCP_CONTAINER_REGISTRY }}/customk:latest - cache-from: type=registry,ref=${{ secrets.NCP_CONTAINER_REGISTRY }}/customk:latest + ${{ secrets.NCP_CONTAINER_REGISTRY }}/customk-app:${{ github.run_number }} + ${{ secrets.NCP_CONTAINER_REGISTRY }}/customk-app:latest + cache-from: type=registry,ref=${{ secrets.NCP_CONTAINER_REGISTRY }}/customk-app:latest cache-to: type=inline - name: Build and push nginx image uses: docker/build-push-action@v3 with: - context: . - file: ./nginx/Dockerfile + context: ./nginx + file: ./Dockerfile push: true tags: | ${{ secrets.NCP_CONTAINER_REGISTRY }}/customk-nginx:${{ github.run_number }} diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 1c08b96..6f7480d 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -24,7 +24,6 @@ services: ports: - "80:80" volumes: - - ./nginx.conf:/etc/nginx/nginx.conf:ro - static-data:/vol/web depends_on: - app