From 9ea242c813bed9550ae2d129a077385e2f4ae9ab Mon Sep 17 00:00:00 2001
From: Oscar <oscarrc.web@gmail.com>
Date: Wed, 20 Mar 2024 13:07:20 +0100
Subject: [PATCH] [MOD] Refactor server and dockerfile

---
 .github/workflows/server-build.yml                  |   5 ++++-
 .dockerignore => server/.dockerignore               |   0
 dockerfile => server/dockerfile                     |   3 +--
 server/router.js                                    |   2 +-
 .../tf}/backend/tfjs-backend-wasm-simd.wasm         | Bin
 .../backend/tfjs-backend-wasm-threaded-simd.wasm    | Bin
 {tf => server/tf}/backend/tfjs-backend-wasm.wasm    | Bin
 {tf => server/tf}/nsfw/group1-shard1of2.bin         | Bin
 {tf => server/tf}/nsfw/group1-shard2of2.bin         |   0
 {tf => server/tf}/nsfw/model.json                   |   0
 10 files changed, 6 insertions(+), 4 deletions(-)
 rename .dockerignore => server/.dockerignore (100%)
 rename dockerfile => server/dockerfile (66%)
 rename {tf => server/tf}/backend/tfjs-backend-wasm-simd.wasm (100%)
 rename {tf => server/tf}/backend/tfjs-backend-wasm-threaded-simd.wasm (100%)
 rename {tf => server/tf}/backend/tfjs-backend-wasm.wasm (100%)
 rename {tf => server/tf}/nsfw/group1-shard1of2.bin (100%)
 rename {tf => server/tf}/nsfw/group1-shard2of2.bin (100%)
 rename {tf => server/tf}/nsfw/model.json (100%)

diff --git a/.github/workflows/server-build.yml b/.github/workflows/server-build.yml
index b57d52c..b182bb7 100644
--- a/.github/workflows/server-build.yml
+++ b/.github/workflows/server-build.yml
@@ -10,6 +10,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            server
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
@@ -23,7 +26,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
-          context: .
+          context: "{{defaultContext}}:server"
           platforms: linux/amd64
           push: true
           tags: ghcr.io/${{ github.repository }}:latest, ghcr.io/${{ github.repository }}:${{ github.ref_name }}
diff --git a/.dockerignore b/server/.dockerignore
similarity index 100%
rename from .dockerignore
rename to server/.dockerignore
diff --git a/dockerfile b/server/dockerfile
similarity index 66%
rename from dockerfile
rename to server/dockerfile
index 9e29f1b..f5e7b17 100644
--- a/dockerfile
+++ b/server/dockerfile
@@ -1,8 +1,7 @@
 FROM node:20.11.0-alpine3.18
 WORKDIR /home/node
 USER node
-COPY --chown=node:node server server
-COPY --chown=node:node tf tf
+COPY --chown=node:node * server
 WORKDIR /home/node/server
 RUN npm install
 EXPOSE 8080
diff --git a/server/router.js b/server/router.js
index 03795b4..c087ddd 100644
--- a/server/router.js
+++ b/server/router.js
@@ -15,7 +15,7 @@ const Router = () => {
     router.get("/chat", ChatController.count.bind(ChatController))
           .post("/chat", ChatController.find.bind(ChatController))
     
-    router.use('/tf', express.static(join(__dirname, "../../tf")))
+    router.use('/tf', express.static(join(__dirname, "./tf")))
 
     return router;
 }
diff --git a/tf/backend/tfjs-backend-wasm-simd.wasm b/server/tf/backend/tfjs-backend-wasm-simd.wasm
similarity index 100%
rename from tf/backend/tfjs-backend-wasm-simd.wasm
rename to server/tf/backend/tfjs-backend-wasm-simd.wasm
diff --git a/tf/backend/tfjs-backend-wasm-threaded-simd.wasm b/server/tf/backend/tfjs-backend-wasm-threaded-simd.wasm
similarity index 100%
rename from tf/backend/tfjs-backend-wasm-threaded-simd.wasm
rename to server/tf/backend/tfjs-backend-wasm-threaded-simd.wasm
diff --git a/tf/backend/tfjs-backend-wasm.wasm b/server/tf/backend/tfjs-backend-wasm.wasm
similarity index 100%
rename from tf/backend/tfjs-backend-wasm.wasm
rename to server/tf/backend/tfjs-backend-wasm.wasm
diff --git a/tf/nsfw/group1-shard1of2.bin b/server/tf/nsfw/group1-shard1of2.bin
similarity index 100%
rename from tf/nsfw/group1-shard1of2.bin
rename to server/tf/nsfw/group1-shard1of2.bin
diff --git a/tf/nsfw/group1-shard2of2.bin b/server/tf/nsfw/group1-shard2of2.bin
similarity index 100%
rename from tf/nsfw/group1-shard2of2.bin
rename to server/tf/nsfw/group1-shard2of2.bin
diff --git a/tf/nsfw/model.json b/server/tf/nsfw/model.json
similarity index 100%
rename from tf/nsfw/model.json
rename to server/tf/nsfw/model.json