From 654ef0e76a28e3cfe71628f52456c382a14856b0 Mon Sep 17 00:00:00 2001
From: Mathieu B <broilletmathieu@protonmail.com>
Date: Wed, 30 Nov 2022 14:05:30 +0100
Subject: [PATCH] docker stuff

---
 Dockerfile        | 18 +++++++++---------
 Dockerfile.alpine | 25 -------------------------
 2 files changed, 9 insertions(+), 34 deletions(-)
 delete mode 100644 Dockerfile.alpine

diff --git a/Dockerfile b/Dockerfile
index 734146b..72d2996 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,20 @@
-FROM debian:bullseye
+FROM python:3.9-alpine
 
-ENV DEBIAN_FRONTEND=noninteractive
 ENV ENV_STATUS=${NODE_ENV:-production}
 
-# For suport set local time zone.
-RUN apt-get update -y && apt-get upgrade -y
+# needed in older versions of jarvis-server
+# RUN apk update && apk upgrade
+# RUN apk add --no-cache --upgrade grep
 
 WORKDIR /jarvis
 
-RUN apt install python3.9 python3-pip python3.9-dev python3.9-distutils python3-fann2 libfann-dev swig git python3-levenshtein curl -y
+COPY ./jarvis /jarvis
 
-RUN git clone --progress --verbose https://github.com/M4TH1EU/jarvis-server-v2.git .
+# needed in older versions of jarvis-server
+# RUN apk add build-base python3 python3-dev py3-pip py3-distutils-extra py3-fann2 fann-dev swig
 
-RUN python3 -m pip install -r requirements.txt
-
-RUN apt-get clean -y
+COPY requirements.txt /jarvis/
+RUN python3 -m pip install --no-cache-dir -r requirements.txt
 
 EXPOSE 5000
 
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
deleted file mode 100644
index 2052526..0000000
--- a/Dockerfile.alpine
+++ /dev/null
@@ -1,25 +0,0 @@
-# ALPINE VERSION OF THE DOCKER FILE, NOT WORKING ATM.
-# TRYING TO SEE IF THERE IS A DIFFERENCE USING AN UBUNTU IMAGE OR AN ALPINE
-
-FROM python:3.9-alpine
-
-ENV ENV_STATUS=${NODE_ENV:-production}
-
-# For suport set local time zone.
-RUN apk update && apk upgrade
-
-RUN apk add --no-cache --upgrade grep
-
-WORKDIR /jarvis
-
-COPY ./jarvis /jarvis
-
-# RUN apk add build-base python3 python3-dev py3-pip py3-distutils-extra py3-fann2 fann-dev swig
-
-RUN python3 -m pip install --no-cache-dir -r requirements.txt
-
-RUN apk cache clean
-
-EXPOSE 5000
-
-ENTRYPOINT [ "python3", "/jarvis/start.py"]
\ No newline at end of file