From 58590a56ea8796428786bc6f59af1b290f1c513c Mon Sep 17 00:00:00 2001
From: Jon Lawrence <jlawrence11@gmail.com>
Date: Fri, 7 Mar 2025 14:07:14 -0800
Subject: [PATCH] Dockerfile now named correctly

Dockerfile is now named correctly, and pulls from the local repository/directory instead of pulling the image from github.
---
 Dockerfile      | 18 ++++++++++++++++++
 Dockerfile-jank | 18 ------------------
 compose.yaml    |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 Dockerfile
 delete mode 100644 Dockerfile-jank

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..6676f2d
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,18 @@
+FROM node:18-bullseye AS builder
+
+WORKDIR /devel
+RUN apt-get update ; apt-get upgrade -y ; apt-get install -y build-essential
+COPY . .
+RUN npm i ; npm run build
+
+FROM node:18-alpine
+
+EXPOSE 8080
+WORKDIR /exec
+RUN apk add --update nodejs npm
+COPY --from=builder /devel/ . 
+RUN adduser -D jankclient
+
+USER jankclient
+
+CMD ["npm", "start"]
diff --git a/Dockerfile-jank b/Dockerfile-jank
deleted file mode 100644
index a004369..0000000
--- a/Dockerfile-jank
+++ /dev/null
@@ -1,18 +0,0 @@
-From node:18-bullseye as builder
-
-WORKDIR devel/
-RUN apt-get update ; apt-get upgrade -y ; apt-get install -y python-is-python3 build-essential git
-RUN git clone https://github.com/MathMan05/JankClient
-RUN cd JankClient ; npm i ; npm run build
-
-From node:18-alpine
-
-EXPOSE 8080
-WORKDIR exec
-RUN apk add --update git nodejs npm
-COPY --from=builder /devel/JankClient/ . 
-RUN adduser -D jankclient
-
-USER jankclient
-
-CMD ["npm", "start"]
diff --git a/compose.yaml b/compose.yaml
index f93d94a..ba6944f 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -2,7 +2,7 @@ services:
   jank:
     build:
       context: .
-      dockerfile: Dockerfile-jank
+      dockerfile: Dockerfile
     restart: unless-stopped
     ports: 
       - "8080:8080"