Merge pull request #39 from stacken/restructure

Restructure

Author: nsg

.github/workflows/black.yml

@@ -19,6 +19,6 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -q -r requirements-dev.txt
+          pip install -q -r app/requirements-dev.txt
       - name: Check with Black formatter
-        run: black --check fingerweb finger services
+        run: black --check app

.github/workflows/test.yml

@@ -21,12 +21,13 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -q -r requirements-dev.txt
+        pip install -q -r app/requirements-dev.txt
     - name: Test with pytest
       env:
         SECRET_KEY: t
         ALLOWED_HOSTS: localhost
         DATABASE_URL: "sqlite://:memory:"
         DEBUG: true
       run: |
+        cd app
         pytest

.gitignore

@@ -1,9 +1,9 @@
 *~
 __pycache__
 
-/db.sqlite3
+/app/db.sqlite3
 /finger/static/.sass-cache/
-/static/
+/app/static/
 /.env
 /.vscode
 /import

Dockerfile

@@ -1,46 +1,57 @@
-FROM python:3
 
-EXPOSE 8080
+#
+# Launch a build container so we do not need to care about junk in the production image
+#
+FROM python:3 AS build
 
-# Setup environment, ARG are only available during the build.
-ENV PYTHONUNBUFFERED 1
+# This is needed to start the Django app
 ARG SECRET_KEY=none
 ARG ALLOWED_HOSTS=localhost
 ARG DATABASE_URL=sqlite:///db.sqlite3
 
+# Install sass
+RUN apt-get update
+RUN apt-get -y install ruby-sass
+
+# Deploy files and install requirements
+ADD app/requirements.txt /app/requirements.txt
+RUN pip install -r /app/requirements.txt
+ADD app /app
+RUN touch /app/.env
+RUN mkdir /app/logs
+WORKDIR /app
+
+# Migrate (needed) and compile the static assets
+RUN /app/manage.py migrate
+RUN /app/manage.py compilestatic
+RUN /app/manage.py collectstatic --noinput
+
+# Clean up junk
+RUN find /app -type f -name *.pyc -delete
+RUN find /app -type d -name __pycache__ -delete
+RUN find /app -type d -name .sass-cache -exec rm -rf {} \; || :
+RUN rm db.sqlite3
+
+#
+# The production container
+#
+FROM python:3
+EXPOSE 8080
+
+COPY --from=build /app /app
+
 RUN apt-get update \
-	&& apt-get -y install ruby-sass nginx \
-	# Install pip2 for supervisor and supervisor-stdout \
-	&& apt-get install -y python-pip \
-	&& pip2 install supervisor supervisor-stdout \
-	# Remove repo metadata to keep layer size down \
+	&& apt-get -y install nginx ruby-sass \
 	&& rm -rf /var/lib/apt/lists/*
 
-ADD requirements.txt /app/requirements.txt
 RUN pip install -r /app/requirements.txt
-COPY manage.py /app/
-COPY finger /app/finger/
-COPY fingerweb /app/fingerweb/
-COPY services /app/services/
 WORKDIR /app
 
 RUN adduser --no-create-home --gecos FALSE --disabled-password finger \
-	# Get rid of warnings \
-	&& touch /app/.env \
 	&& sed -i "s/XXX_BUILD_DATE_XXX/`date +'%F %T'`/" /app/fingerweb/settings.py \
-	# compilestatic requires an database, hence migrate. \
-	&& /app/manage.py migrate \
-	# Compile static resources \
-	&& /app/manage.py compilestatic \
-	&& /app/manage.py collectstatic --noinput \
-	# Clean up, make directories and fix permissions \
-	&& rm /app/*.sqlite3 \
-	&& rm /app/*.txt \
-	&& mkdir /app/logs \
 	&& chown -R finger:finger /app
 
 ADD conf/nginx.conf /etc/nginx/nginx.conf
-ADD conf/supervisord.conf /etc/supervisor/
-ADD conf/supervisor/ /etc/supervisor/conf.d/
+ADD entrypoint.sh /app/entrypoint.sh
 
-CMD ["supervisord", "-nc", "/etc/supervisor/supervisord.conf"]
+CMD /app/entrypoint.sh