From 152522c2280fd367aaf3d18801c332ed1293d0a6 Mon Sep 17 00:00:00 2001 From: DarkSky Date: Thu, 4 Aug 2022 15:35:14 +0800 Subject: [PATCH] chore: ci adjust --- Caddyfile-venus => .github/deployment/Caddyfile-venus | 0 Dockerfile-keck => .github/deployment/Dockerfile-keck | 0 Dockerfile-venus => .github/deployment/Dockerfile-venus | 2 +- .github/workflows/keck.yml | 2 +- .github/workflows/venus.yml | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename Caddyfile-venus => .github/deployment/Caddyfile-venus (100%) rename Dockerfile-keck => .github/deployment/Dockerfile-keck (100%) rename Dockerfile-venus => .github/deployment/Dockerfile-venus (86%) diff --git a/Caddyfile-venus b/.github/deployment/Caddyfile-venus similarity index 100% rename from Caddyfile-venus rename to .github/deployment/Caddyfile-venus diff --git a/Dockerfile-keck b/.github/deployment/Dockerfile-keck similarity index 100% rename from Dockerfile-keck rename to .github/deployment/Dockerfile-keck diff --git a/Dockerfile-venus b/.github/deployment/Dockerfile-venus similarity index 86% rename from Dockerfile-venus rename to .github/deployment/Dockerfile-venus index 55ece303c6..e5dc03cd90 100644 --- a/Dockerfile-venus +++ b/.github/deployment/Dockerfile-venus @@ -7,7 +7,7 @@ RUN npm i -g pnpm@7 && pnpm i --frozen-lockfile --store=node_modules/.pnpm-store FROM node:16-alpine as relocate WORKDIR /app COPY --from=builder /app/dist/apps/venus ./dist -COPY --from=builder /app/Caddyfile-venus ./Caddyfile +COPY --from=builder /app/.github/deployment/Caddyfile-venus ./Caddyfile RUN rm ./dist/*.txt # ============= diff --git a/.github/workflows/keck.yml b/.github/workflows/keck.yml index d7b915c100..66a5f69d28 100644 --- a/.github/workflows/keck.yml +++ b/.github/workflows/keck.yml @@ -60,7 +60,7 @@ jobs: uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc with: context: . - file: ./Dockerfile-keck + file: ./.github/deployment/Dockerfile-keck push: ${{ github.ref == 'refs/heads/field' && true || false }} tags: ${{ steps.meta_keck.outputs.tags }} labels: ${{ steps.meta_keck.outputs.labels }} diff --git a/.github/workflows/venus.yml b/.github/workflows/venus.yml index 59bf758cdc..0e084b1259 100644 --- a/.github/workflows/venus.yml +++ b/.github/workflows/venus.yml @@ -59,7 +59,7 @@ jobs: uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc with: context: . - file: ./Dockerfile-venus + file: ./.github/deployment/Dockerfile-venus push: ${{ github.ref == 'refs/heads/master' && true || false }} tags: ${{ steps.meta_venus.outputs.tags }} labels: ${{ steps.meta_venus.outputs.labels }}