From d47dab453bd90a91a007bd5fc15ecfc8d4d1a93c Mon Sep 17 00:00:00 2001 From: Liam Date: Thu, 16 Nov 2023 12:49:58 +0000 Subject: [PATCH] 7 --- .gitea/workflows/publish.yml | 6 ++---- apps/node/Dockerfile => Dockerfile.Node | 6 +++--- apps/proxy/Dockerfile => Dockerfile.Proxy | 6 +++--- 3 files changed, 8 insertions(+), 10 deletions(-) rename apps/node/Dockerfile => Dockerfile.Node (67%) rename apps/proxy/Dockerfile => Dockerfile.Proxy (67%) diff --git a/.gitea/workflows/publish.yml b/.gitea/workflows/publish.yml index 8be8b9d..3a3cda7 100644 --- a/.gitea/workflows/publish.yml +++ b/.gitea/workflows/publish.yml @@ -29,14 +29,12 @@ jobs: uses: docker/build-push-action@v4 with: push: true - context: ./apps/node - file: ./apps/node/Dockerfile + file: ./Dockerfile.Node tags: fascinated/proxy:node-latest - name: Build and Push (Proxy) uses: docker/build-push-action@v4 with: push: true - context: ./apps/proxy - file: ./apps/proxy/Dockerfile + file: ./Dockerfile.Proxy tags: fascinated/proxy:proxy-latest diff --git a/apps/node/Dockerfile b/Dockerfile.Node similarity index 67% rename from apps/node/Dockerfile rename to Dockerfile.Node index 93aede1..3778d2e 100644 --- a/apps/node/Dockerfile +++ b/Dockerfile.Node @@ -4,10 +4,10 @@ WORKDIR /usr/src/app # Copy root package.json and lockfile COPY package.json ./ -# COPY pnpm-lock.yaml ./ +COPY pnpm-lock.yaml ./ -# # Copy the node package.json -# COPY apps/node/package.json ./apps/node/package.json +# Copy the node package.json +COPY apps/node/package.json ./apps/node/package.json RUN pnpm install diff --git a/apps/proxy/Dockerfile b/Dockerfile.Proxy similarity index 67% rename from apps/proxy/Dockerfile rename to Dockerfile.Proxy index 2f0ace4..fd33a39 100644 --- a/apps/proxy/Dockerfile +++ b/Dockerfile.Proxy @@ -4,10 +4,10 @@ WORKDIR /usr/src/app # Copy root package.json and lockfile COPY package.json ./ -# COPY pnpm-lock.yaml ./ +COPY pnpm-lock.yaml ./ -# # Copy the proxy package.json -# COPY apps/proxy/package.json ./apps/proxy/package.json +# Copy the proxy package.json +COPY apps/proxy/package.json ./apps/proxy/package.json RUN pnpm install