Updates to docker deployment.

docker/Dockerfile.dev

@@ -12,13 +12,16 @@ RUN apk update \
 
 # npm & Gulp
 RUN apk add --update nodejs-npm
-RUN npm install -g gulp
+RUN npm install -g gulp-cli
 
-# For testing
+# for testing
 RUN apk add bash procps
 
-# copy project
-COPY . /usr/src/hypha/
+# copy requirements.txt
+COPY requirements.txt /usr/src/hypha/
+
+# set working directory
+WORKDIR /usr/src/hypha/
 
 # install python dependencies
 RUN pip install -r requirements.txt
@@ -26,4 +29,4 @@ RUN pip install -r requirements.txt
 RUN apk del build-deps
 
 # run entrypoint.sh
-ENTRYPOINT ["/usr/src/hypha/docker/entrypoint.dev.sh"]
\ No newline at end of file
+ENTRYPOINT ["/usr/src/hypha/docker/entrypoint.dev.sh"]

docker/dev.yaml

@@ -10,16 +10,10 @@ services:
     ports:
       - 8080:8080
     environment:
-      - DEBUG=1
       - DJANGO_SETTINGS_MODULE=opentech.settings.dev
-      - SECURE_SSL_REDIRECT=false
-      - SQL_ENGINE=django.db.backends.postgresql
-      - SQL_DATABASE=hypha
-      - SQL_USER=hypha
-      - SQL_PASSWORD=hypha
-      - SQL_HOST=db
-      - SQL_PORT=5432
-      - DATABASE=postgres
+      - DATABASE_URL=postgres://hypha:hypha@db:5432/hypha
+      - PYTHONDONTWRITEBYTECODE=1
+      - PYTHONUNBUFFERED=1
     depends_on:
       - db
   db:

docker/entrypoint.dev.sh

@@ -19,5 +19,6 @@ python manage.py migrate
 python manage.py createsuperuser --no-input
 python manage.py wagtailsiteupdate hypha.test apply.hypha.test 80
 python manage.py runserver 8080
+# gunicorn opentech.wsgi:application --reload --daemon --workers 3 --bind 127.0.0.1:8080 --env DJANGO_SETTINGS_MODULE=opentech.settings.dev
 
 exec "$@"

docker/nginx/nginx.conf

@@ -13,8 +13,12 @@ server {
         proxy_redirect off;
     }
 
-    location /staticfiles/ {
+    location /media/ {
+        alias /usr/src/hypha/media/;
+    }
+
+    location /static/ {
         alias /usr/src/hypha/static/;
     }
 
-}
\ No newline at end of file
+}

docker/requirements.txt

-# Development dependencies, install manually if needed.
-# stellar==0.4.5
-# Werkzeug==0.14.1
-
-# Test dependencies
-flake8
-factory_boy==2.9.2
-wagtail-factories==1.1.0
-responses==0.10.4
-
-# Monitor dependencies
-scout-apm==2.0.1
-sentry-sdk==0.12.1
-
-# Production dependencies
-boto3==1.9.160
-celery==4.2.1
-dj-database-url==0.5.0
-django-anymail==6.0.1
-django-basic-auth-ip-whitelist==0.2.1
-django-bleach==0.5.3
-django-countries==5.3.3
-django-extensions==2.1.7
-django-filter==2.1.0
-django-fsm==2.6.1
-django-heroku==0.3.1
-django-hijack==2.1.10
-django-pagedown==1.0.6
-django-pwned-passwords==3.0.0
-django-redis==4.10.0
-django-referrer-policy==1.0
-django-storages==1.7.1
-django-tables2==1.21.2
-django-tinymce4-lite==1.7.5
-django-two-factor-auth==1.9.1
-django-webpack-loader==0.6.0
-django_select2==7.1.0
-djangorestframework==3.9.2
-django==2.1.11
-gunicorn==19.9.0
-mailchimp3==3.0.7
-mistune==0.8.4
-Pillow==5.4.1
-psycopg2==2.7.3.1
-social_auth_app_django==3.1.0
-tomd==0.1.3
-wagtail==2.5.1
-wagtail-cache==0.5.1
-whitenoise==4.1.2