From 062c6bedea436115612771034d572528f684a76d Mon Sep 17 00:00:00 2001
From: Hri7566 <hri7566@gmail.com>
Date: Wed, 21 Aug 2024 19:37:32 -0400
Subject: [PATCH] i can't fix it

---
 Dockerfile              |  34 ++++++++--------------------------
 bun.lockb               | Bin 76003 -> 76003 bytes
 scripts/start_docker.sh |   3 +++
 src/index.ts            |   1 +
 4 files changed, 12 insertions(+), 26 deletions(-)
 create mode 100755 scripts/start_docker.sh

diff --git a/Dockerfile b/Dockerfile
index 436da2d..8a29583 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,34 +1,16 @@
 FROM oven/bun:latest AS base
 WORKDIR /usr/src/app
 
-FROM base AS install
-RUN mkdir -p /temp/dev
-COPY package.json bun.lockb /temp/dev/
-RUN cd /temp/dev && bun install --frozen-lockfile
+COPY src src
+COPY public public
+COPY config config
+COPY *.json ./
+COPY mppkey ./mppkey
 
-RUN mkdir -p /temp/prod
-COPY package.json bun.lockb /temp/prod
-RUN cd /temp/prod && bun install --frozen-lockfile --production
+RUN bun install
+RUN bunx prisma generate
 
-FROM base AS prerelease
-COPY --from=install /temp/dev/node_modules node_modules
-COPY . .
+# Mount ./prisma to /usr/src/app/prisma
 
-ENV NODE_ENV=production
-#RUN bun test
-#RUN bun build
-
-FROM base AS release
-COPY --from=install /temp/prod/node_modules node_modules
-COPY --from=prerelease /usr/src/app/src/ ./src
-COPY --from=prerelease /usr/src/app/package.json .
-COPY --from=prerelease /usr/src/app/config ./config
-COPY --from=prerelease /usr/src/app/public ./public
-COPY --from=prerelease /usr/src/app/mppkey ./mppkey
-COPY --from=prerelease /usr/src/app/tsconfig.json .
-COPY --from=prerelease /usr/src/app/prisma ./prisma
-COPY --from=prerelease /usr/src/app/.env .
-
-USER bun
 EXPOSE 8443/tcp
 ENTRYPOINT [ "bun", "." ]
diff --git a/bun.lockb b/bun.lockb
index a666ad28106aa49919831846e22ed4ba64952754..370a23d927109c58f83ce3c8eb54d1844a5e6464 100755
GIT binary patch
delta 23
fcmaESk>&A4mJR#Qb1=pkn(7(q8E-y*UM3O%gi{In

delta 23
acmaESk>&A4mJR#Qb1*SLz~<xUWg-D~F$i}6

diff --git a/scripts/start_docker.sh b/scripts/start_docker.sh
new file mode 100755
index 0000000..de2396d
--- /dev/null
+++ b/scripts/start_docker.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+docker build --pull -t mpp-server-dev2 . && docker run -p 8443:8443 mpp-server-dev2
diff --git a/src/index.ts b/src/index.ts
index ee61822..93d8b06 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -17,6 +17,7 @@
 import "./ws/server";
 import { loadForcedStartupChannels } from "./channel/forceLoad";
 import { Logger } from "./util/Logger";
+// docker hates this next one
 import { startReadline } from "./util/readline";
 import { startMetricsServer } from "./util/metrics";