From 7b2c47a4c3e0992817191bca136fdadc1504f65d Mon Sep 17 00:00:00 2001
From: Gertjan van den Burg <gertjanvandenburg@gmail.com>
Date: Mon, 1 Apr 2019 14:54:46 +0100
Subject: Various fixes to get the app to work in docker

---
 Dockerfile | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index d7e5ff6..b9abb92 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,12 @@
-FROM python:3.6-alpine
+FROM python:3.7-alpine
+
+RUN apk add gcc musl-dev libffi-dev openssl-dev
 
 # This Dockerfile is based on:
 # https://blog.miguelgrinberg.com/post/the-flask-mega-tutorial-part-xix-deployment-on-docker-containers
 
-RUN adduser -D annotatechange
+RUN addgroup --gid 1024 mygroup
+RUN adduser --ingroup mygroup -D annotatechange
 
 WORKDIR /home/annotatechange
 
@@ -20,7 +23,7 @@ ENV YOUR_ENV=${YOUR_ENV} \
 
 RUN pip install "poetry==$POETRY_VERSION"
 
-COPY poetry.lock pyproject.toml /home/annotatechange
+COPY poetry.lock pyproject.toml /home/annotatechange/
 
 RUN poetry config settings.virtualenvs.create false \
 	    && poetry install $(test "$YOUR_ENV" == production && echo "--no-dev") \
@@ -33,8 +36,13 @@ RUN chmod +x boot.sh
 
 ENV FLASK_APP annotate_change.py
 
-RUN chown -R annotatechange:annotatechange ./
+RUN mkdir -p /home/annotatechange/instance
+VOLUME /home/annotatechange/instance
+
+RUN ls -lh /home/annotatechange/instance
+
+RUN chown -R annotatechange:mygroup /home/annotatechange
 USER annotatechange
 
-EXPOSE 80
+EXPOSE 7831
 ENTRYPOINT ["./boot.sh"]
-- 
cgit v1.2.3