From b3eb64d88a9a804d343819fafca639aad70bad15 Mon Sep 17 00:00:00 2001
From: sukui <37778349+sukui24@users.noreply.github.com>
Date: Thu, 24 Oct 2024 19:51:28 +0300
Subject: [PATCH] Fix server deploy (#68)

* fix: server deploy

* fix: move docker context up

* fix: delete copy-schema

---------

Co-authored-by: asion <asion.desu@gmail.com>
---
 .github/workflows/docker.yml                     | 8 ++------
 {server => docker}/Dockerfile                    | 8 ++++++--
 server/src/controllers/rest/SwaggerController.ts | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename {server => docker}/Dockerfile (69%)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d5de9293..4ef51f19 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -26,14 +26,12 @@ jobs:
     runs-on: ubuntu-latest
     needs: pre_job
     if: ${{ needs.pre_job.outputs.should_run_server == 'true' }}
-    defaults:
-      run:
-        working-directory: ./server
     permissions:
       contents: read
       packages: write
     steps:
       - uses: actions/checkout@v4
+
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
@@ -54,13 +52,11 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - run: cp openapi/schema.json server/
-
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
-          context: ./server/
           push: true
+          file: ./docker/Dockerfile
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
diff --git a/server/Dockerfile b/docker/Dockerfile
similarity index 69%
rename from server/Dockerfile
rename to docker/Dockerfile
index 81c6368f..6a80078a 100644
--- a/server/Dockerfile
+++ b/docker/Dockerfile
@@ -4,17 +4,21 @@ FROM node:20.12-slim
 WORKDIR /usr/src/app
 
 # Copy package.json and package-lock.json
-COPY package*.json ./
+COPY server/package*.json ./
 
 # Install app dependencies
 RUN npm ci
 
 # Bundle app source
-COPY . .
+COPY server .
 
 # Build the TypeScript files
 RUN npm run build
 
+# Copy openapi schema
+RUN mkdir /usr/src/openapi/
+COPY openapi/schema.json /usr/src/openapi/
+
 # Expose port server port
 EXPOSE 3000
 
diff --git a/server/src/controllers/rest/SwaggerController.ts b/server/src/controllers/rest/SwaggerController.ts
index 5790a1e6..1689410d 100644
--- a/server/src/controllers/rest/SwaggerController.ts
+++ b/server/src/controllers/rest/SwaggerController.ts
@@ -12,7 +12,7 @@ export class SwaggerRestApiController {
   constructor(ctx: ApiContext) {
     const app = ctx.app;
     const router = Router();
-    this._jsonPath = path.join(process.cwd(), "./schema.json");
+    this._jsonPath = path.join(process.cwd(), "../openapi/schema.json");
 
     app.use("/v1/api-docs", router);