From 122faa1c5dc989f518cf03b4c82af0dba02e500f Mon Sep 17 00:00:00 2001
From: binaryDiv <binarydiv@gmail.com>
Date: Sat, 19 Oct 2019 01:48:41 +0200
Subject: [PATCH] #1 #2: first 'production' deployment (will get better);
 encrypted production secrets; add Makefile

---
 .deployment/production/docker-compose.yml     |   9 +++++
 .deployment/production/production.secrets.env | Bin 0 -> 30 bytes
 .gitattributes                                |   1 +
 Dockerfile                                    |   8 +++--
 Makefile                                      |  34 ++++++++++++++++++
 5 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 .deployment/production/docker-compose.yml
 create mode 100644 .deployment/production/production.secrets.env
 create mode 100644 .gitattributes
 create mode 100644 Makefile

diff --git a/.deployment/production/docker-compose.yml b/.deployment/production/docker-compose.yml
new file mode 100644
index 0000000..2f56473
--- /dev/null
+++ b/.deployment/production/docker-compose.yml
@@ -0,0 +1,9 @@
+version: "3"
+
+services:
+  django-server:
+    build: ../../
+    ports:
+      - "8042:8042"
+    env_file:
+      - production.secrets.env
diff --git a/.deployment/production/production.secrets.env b/.deployment/production/production.secrets.env
new file mode 100644
index 0000000000000000000000000000000000000000..28ec94a94d24be5f3ee2703b9864014d42124a42
GIT binary patch
literal 30
mcmZQ@_Y83kiVO&0uyZ#H*R8%brDsy)wq<;Yd^1)`ng9Tk6AF0%

literal 0
HcmV?d00001

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..058ee43
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.secrets.env filter=git-crypt diff=git-crypt
diff --git a/Dockerfile b/Dockerfile
index 436d65e..af71bc2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,5 +13,9 @@ RUN pip3 install --upgrade pip && \
 
 COPY . .
 
-CMD ["gunicorn", "pluralityspace.wsgi:application", \
-                 "--bind", "0.0.0.0:8042"]
+# TODO #1: build a real production setup with gunicorn, nginx for static files etc.
+#CMD ["gunicorn", "pluralityspace.wsgi:application", \
+#                 "--bind", "0.0.0.0:8042"]
+
+ENTRYPOINT ["python3", "./manage.py"]
+CMD ["runserver", "0.0.0.0:8042"]
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..b29ca5e
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,34 @@
+# General settings
+APP_NAME := pluralityspace
+PYTHON ?= python3
+
+# Development server
+SERVER_LISTEN ?= 0.0.0.0:8042
+
+# Deployment settings
+STAGE ?= production
+GIT_CRYPT_KEY ?= ~/.git-crypt-keys/$(APP_NAME)-$(STAGE).key
+DOCKER_COMPOSE_YML := .deployment/$(STAGE)/docker-compose.yml
+
+.PHONY: run decrypt deploy-production
+
+# Default target: none
+all:
+
+
+### Local development
+
+# Run django development server
+run:
+	$(PYTHON) manage.py runserver $(SERVER_LISTEN)
+
+
+### Deployment
+
+# Unlock git-crypted production secrets
+decrypt:
+	git-crypt unlock $(GIT_CRYPT_KEY)
+
+# Deploy on production using docker-compose
+deploy:
+	docker-compose -f $(DOCKER_COMPOSE_YML) up --build --detach