From a4bdc1dfc10139ca5d4f47ae82c0dee21bec38ca Mon Sep 17 00:00:00 2001
From: sripwoud <me@sripwoud.xyz>
Date: Mon, 9 Sep 2024 15:42:50 +0200
Subject: [PATCH] chore(server): build prod Docker image

---
 bun.lockb                                  | Bin 156930 -> 156962 bytes
 server/.dockerignore                       |   1 +
 server/Dockerfile                          |  18 ++++++++++++------
 server/fly.toml                            |   4 ++--
 server/package.json                        |   3 ++-
 server/render.yaml                         |  13 -------------
 server/src/lib/run-snarkjs-verification.ts |   2 +-
 yarn.lock                                  |   5 +++--
 8 files changed, 21 insertions(+), 25 deletions(-)
 create mode 100644 server/.dockerignore
 delete mode 100644 server/render.yaml

diff --git a/bun.lockb b/bun.lockb
index 77a164c8c0287f75a4d9b6793a881c8c970a7d3d..30d9f23535e9d41f7449276e85cec71f4a0cacaa 100755
GIT binary patch
delta 6797
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

delta 6943
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
IO{IJO1wAWNo&W#<

diff --git a/server/.dockerignore b/server/.dockerignore
new file mode 100644
index 0000000..3c3629e
--- /dev/null
+++ b/server/.dockerignore
@@ -0,0 +1 @@
+node_modules
diff --git a/server/Dockerfile b/server/Dockerfile
index 8a60985..c951828 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -3,13 +3,19 @@ FROM node:20-alpine as base
 RUN apk update && apk upgrade && apk add dumb-init && apk add --no-cache bash
 WORKDIR app
 
-COPY *.json .
+FROM base as build
+COPY *.json ./
 COPY src ./src
+RUN npm i -g pnpm &&\
+    pnpm i &&\
+    pnpm tsc &&\
+    rm -fr node_modules &&\
+    pnpm i --prod
 
-RUN npm i -g pnpm && pnpm i
-
-EXPOSE 3000
+FROM base as release
+COPY --from=build /app/dist ./dist
+COPY --from=build /app/node_modules ./node_modules
+EXPOSE 3001
 ENV NODE_ENV=production
-
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]
-CMD ["pnpm", "dev"]
+CMD ["node", "dist"]
diff --git a/server/fly.toml b/server/fly.toml
index fcae878..78f1038 100644
--- a/server/fly.toml
+++ b/server/fly.toml
@@ -8,13 +8,13 @@ primary_region = 'ams'
 
 [env]
   HOST = '0.0.0.0'
-  PORT = '3001'
+  PORT = 3001
   SCOPE = 'dog18'
 
 [build]
 
 [http_service]
-  internal_port = 3000
+  internal_port = 3001
   force_https = true
   auto_stop_machines = true
   auto_start_machines = true
diff --git a/server/package.json b/server/package.json
index 4a8d60c..e7e624f 100644
--- a/server/package.json
+++ b/server/package.json
@@ -19,6 +19,7 @@
     "@types/node-forge": "^1.3.11",
     "@types/pkijs": "^3.0.1",
     "@types/snarkjs": "^0.7.8",
-    "ts-node": "^10.9.2"
+    "ts-node": "^10.9.2",
+    "typescript": "^5.5.4"
   }
 }
diff --git a/server/render.yaml b/server/render.yaml
deleted file mode 100644
index b98a7db..0000000
--- a/server/render.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-services:
-  - type: web
-    name: prndog-server
-    runtime: node
-    repo: https://github.com/prndog/prndog
-    plan: free
-    envVars:
-      - key: BUN_VERSION
-        value: 1.1.18
-    region: oregon
-    buildCommand: bun install
-    startCommand: bun start
-version: '1'
diff --git a/server/src/lib/run-snarkjs-verification.ts b/server/src/lib/run-snarkjs-verification.ts
index 27dd01b..cf721da 100644
--- a/server/src/lib/run-snarkjs-verification.ts
+++ b/server/src/lib/run-snarkjs-verification.ts
@@ -44,7 +44,7 @@ export const runSnarkjsVerification = async (
     const proofPath = await writeTempFile('proof.json', proofData)
 
     const { stdout, stderr } = await execPromise(
-      `pnpx snarkjs groth16 verify ${vkeyPath} ${publicSignalsPath} ${proofPath}`,
+      `npx snarkjs groth16 verify ${vkeyPath} ${publicSignalsPath} ${proofPath}`,
     )
 
     console.log(stdout)
diff --git a/yarn.lock b/yarn.lock
index 2e625eb..00c8d05 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -911,7 +911,7 @@ client@client:
     easyqrcodejs "^4.6.1"
     js-cookie "^3.0.5"
     lottie-react "^2.4.0"
-    million ""
+    million "^3.1.11"
     next "14.2.8"
     react "^18"
     react-dom "^18"
@@ -2293,6 +2293,7 @@ server@server:
     "@types/pkijs" "^3.0.1"
     "@types/snarkjs" "^0.7.8"
     ts-node "^10.9.2"
+    typescript ""
   dependencies:
     asn1js "^3.0.5"
     cors "^2.8.5"
@@ -2626,7 +2627,7 @@ type-is@~1.6.18:
     mime-types "~2.1.24"
     media-typer "0.3.0"
 
-typescript@>=2.7, typescript@>=3, typescript@^5, typescript@^5.2.2:
+typescript@>=2.7, typescript@>=3, typescript@^5, typescript@^5.2.2, typescript@^5.5.4:
   version "5.5.4"
   resolved "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz"
   integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==