Add compose setup

Author: frankwiles

Dockerfile

@@ -1,48 +1,38 @@
-FROM python:3.6
+FROM gladiatr72/just-tini:latest as tini
+
+FROM revolutionsystems/python:3.6.9-wee-optimized-lto
 
 LABEL Description="Image for simpl-calc-ui" Vendor="Wharton" Version="0.1.0"
 
 ENV PYTHONUNBUFFERED 1
 
-ENV DOCKERIZE_VERSION v0.2.0
-
-RUN mkdir -p /root/.ssh \
-    && chmod 700 /root/.ssh \
-    && echo "Host *\n\tStrictHostKeyChecking no\n\n" > /root/.ssh/config
+RUN mkdir /code
+RUN mkdir /code/staticfiles
+RUN mkdir /code/staticfiles/webpack_bundles
 
-ADD keys/wharton_ll /root/.ssh/
-RUN chmod 600 /root/.ssh/wharton_ll
+WORKDIR /code
 
-RUN apt-get update && apt-get install -y wget \
-    && wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
-    && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
-    && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
+COPY --from=tini /tini /tini
 
 RUN pip install --upgrade pip
 
-RUN mkdir /code
-WORKDIR /code
-ADD . /code/
+ADD ./requirements.txt /code/
+RUN pip install -r /code/requirements.txt
 
-ENV PYTHONPATH /code:$PYTHONPATH
+# Setup NodeJS
+RUN set -ex && apt-get update && apt-get -y install curl software-properties-common
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
+RUN apt-get -y install nodejs
 
-RUN eval "$(ssh-agent -s)" \
-    && ssh-add /root/.ssh/wharton_ll \
-    && pip install -r /code/requirements.txt \
-    && pip install -r /code/requirements_dev.txt
+ADD ./package.json /code/
+RUN npm install
 
-RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
-RUN apt-get install -y nodejs \
-    && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
+ADD . /code/
 
-RUN eval "$(ssh-agent -s)" \
-    && ssh-add /root/.ssh/wharton_ll \
-    && npm install --progress=false \
-    && npm dedupe --progress=false \
-    && npm run compile --production \
-    && rm -rf node_modules
+#RUN NODE_ENV=production npm run compile
 
-ENV MODEL_SERVICE_WS ws://model:8080/ws
+ENV PYTHONPATH /code:$PYTHONPATH
+ENV MODEL_SERVICE_WS ws://localhost:8080/ws
 
 EXPOSE 8000
-CMD python check_modelservice.py && gunicorn simpl_calc_ui.wsgi -b 0.0.0.0:8000
+CMD /code/bootstrap.sh

compose-bootstrap.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+python manage.py migrate --no-input
+python manage.py collectstatic --no-input
+
+npm install
+npm rebuild node-sass
+npm run start &
+python manage.py runserver 0.0.0.0:8000

docker-compose.yml

@@ -0,0 +1,23 @@
+version: '3'
+
+services:
+  ui:
+    build:
+      context: .
+    networks:
+      - simpl
+    volumes:
+      - .:/code
+    ports:
+      - "8000:8000"
+    command: /code/compose-bootstrap.sh
+    environment:
+      - DJANGO_SETTINGS_MODULE=simpl_calc_ui.settings
+      - MODEL_SERVICE_WS=ws://localhost:8080/ws
+      - SIMPL_GAMES_URL=http://api:8000/apis/
+    stop_signal: SIGKILL
+
+networks:
+  simpl:
+    external:
+      name: simpl-games-api_simpl