From ad6171c0f3344ea4b9cf59130961956702cce6e7 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Sun, 22 Jul 2018 22:03:03 +0100
Subject: [PATCH] Remove pyenv and nvm, just use apt

---
 .nvmrc     |  1 -
 Dockerfile | 21 ++++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)
 delete mode 100644 .nvmrc

diff --git a/.nvmrc b/.nvmrc
deleted file mode 100644
index 2cf514e..0000000
--- a/.nvmrc
+++ /dev/null
@@ -1 +0,0 @@
-10.5.0
diff --git a/Dockerfile b/Dockerfile
index da245a9..e624039 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,28 @@
-FROM theorangeone/docker-pyenv-nvm
+FROM ubuntu:18.04
 
 ENV LC_ALL C.UTF-8
 ENV LANG C.UTF-8
 
 RUN mkdir /app
 
-RUN apt-get update && apt-get install python3-pip git -y && pip3 install pipenv
+RUN apt-get update && apt-get install -y \
+    python3 \
+    python3-pip \
+    nodejs \
+    npm \
+    git
+
+RUN pip3 install pipenv
 
 WORKDIR /app
 
 COPY Pipfile Pipfile
 COPY Pipfile.lock Pipfile.lock
-
-COPY .nvmrc .nvmrc
-COPY package.json package.json
-COPY package-lock.json package-lock.json
-
 RUN pipenv install --deploy --system
 
-RUN /opt/setup-pyenv-nvm.sh npm install
+COPY package.json package.json
+COPY package-lock.json package-lock.json
+RUN npm install
 
 COPY manage.py /app/manage.py
 COPY project/ /app/project/
@@ -27,5 +31,4 @@ COPY templates/ /app/templates/
 
 RUN ./manage.py collectstatic --noinput
 
-ENTRYPOINT ["/opt/setup-pyenv-nvm.sh"]
 EXPOSE 8000