Merge branch 'develop'

.gitlab-ci.yml

@@ -56,7 +56,7 @@ publish:
     script:
         - docker info
         - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-        - docker build . -t "$IMAGE_NAME"
+        - docker build . -f Dockerfile.prod -t "$IMAGE_NAME"
         - docker push "$IMAGE_NAME"
 
 deploy_dev:

Dockerfile.prod

@@ -0,0 +1,18 @@
+FROM python:alpine
+ENV PYTHONUNBUFFERED 1
+ENV IS_DOCKER 0
+WORKDIR /app
+COPY requirements.txt ./
+COPY requirements-production.txt ./
+
+RUN apk add --no-cache --virtual .build-deps build-base linux-headers \
+    && apk add --no-cache jpeg-dev zlib-dev postgresql-dev \
+    && pip install -r requirements.txt \
+    && pip install -r requirements.production.txt \
+    && apk del .build-deps
+
+COPY . ./
+COPY sikweb/settings-sample-prod.py settings.py
+
+ENTRYPOINT ["sh", "-c", "echo 'Django running on http://localhost:8000 in production mode' \
+    && gunicorn -w 4 -b 0.0.0.0:8000 web20-backend.wsgi"]

docker-compose.yml

@@ -3,6 +3,8 @@ version: '3'
 services:
   db:
     image: postgres
+    volumes:
+      - db-data:/var/lib/postgresql/data
   web:
     build: .
     image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-backend
@@ -11,3 +13,5 @@ services:
       - "8000:8000"
     depends_on:
       - db
+volumes:
+  db-data: {}

sikweb/settings-sample-prod.py

@@ -0,0 +1,50 @@
+
+"""
+Django settings for sikweb project.
+
+Generated by 'django-admin startproject' using Django 1.9.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.9/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/1.9/ref/settings/
+"""
+
+from sikweb.base import *
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = False
+
+ALLOWED_HOSTS = ["sika.sik.party"]
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = os.getenv('SECRET_KEY', '<your secret key>')
+
+# ReCaptcha
+# http://www.yaconiello.com/blog/integrating-google-recaptcha-to-django/
+GOOGLE_RECAPTCHA_SITE_KEY = "YOUR-PUBLIC-KEY"
+GOOGLE_RECAPTCHA_SECRET_KEY = "YOUR-PRIVATE-KEY"
+
+# Email settings (more settings in base.py)
+EMAIL_HOST_USER = os.getenv('EMAIL_HOST', '<gmailtunnarisi>@gmail.com')
+EMAIL_HOST_PASSWORD = os.getenv('EMAIL_PASSWD', '<gmail_passu>')
+DEFAULT_EMAIL_FROM = 'SIK Viestintä <sikviestinta@gmail.com>'
+ENABLE_AUTOMATIC_EMAILS = True
+
+# Token for Telegram bot
+TELEGRAM_BOT_TOKEN = os.getenv('TG_BOT_TOKEN')
+
+# Database settings
+# Only uncomment if default settings in base.py are not ok
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': os.getenv('DB_NAME', '<none>'),
+        'USER': os.getenv('DB_USER', '<none>'),
+        'PASSWORD': os.getenv('DB_PASSWORD', '<none>'),
+        'HOST': os.getenv('DB_HOST', '127.0.0.1'),
+        'PORT': os.getenv('DB_PORT', 5432),
+    }
+}

stack-compose.yml

@@ -1,6 +1,6 @@
 version: '3.2'
 services:
-  web20_backend:
+  backend:
     image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-backend:latest
     ports:
       - 8000:8000