Merge pull request #194 from rambo/fix_build

Make docker builds work again

Author: rambo

.dockerignore

@@ -0,0 +1,21 @@
+.idea
+._*
+.DS_Store
+.cache/
+staticfiles/
+media/
+bower_components/
+asylum/static/css/
+asylum/static/js/
+asylum/static/fonts/
+venv/
+.AppleDouble
+.LSOverride
+*.py[cod]
+*.pyc
+__pycache__
+*.log
+node_modules/
+project/asylum/media/
+*_backup.tar.gz
+.git

.gitignore

@@ -1,3 +1,5 @@
+# Everyone should keep their own configs
+.idea
 # OSX stuff
 ._*
 .DS_Store

docker/dev.sh

@@ -1,8 +1,24 @@
-#!/bin/sh
+#!/bin/bash -e
+SCRIPTDIR=$(python -c 'import os,sys;print os.path.dirname(os.path.realpath(sys.argv[1]))' "$0")
 
-docker build -t asylum_dev .
-docker run --name asylum_dev -d -p 8000:8000 -p 1080:1080 -v `pwd -P`/project:/opt/asylum asylum_dev
-read -p "Press enter to stop and remove the server" dummy
-docker stop asylum_dev
-docker rm asylum_dev
+# Make sure we're in the correct place relative to Dockerfile no matter where we were called from
+cd `dirname "$SCRIPTDIR"`
 
+if [ "$( docker images asylum_dev:latest )" == "" ]
+then
+    docker build -t asylum_dev .
+fi
+echo "Starting devel server."
+echo "To connect to shell in this instance run: docker exec -it asylum_dev /bin/bash"
+echo "Then in that shell run: source ../asylum-venv/bin/activate"
+if [ "$(docker ps -a -q -f name=asylum_dev)" == "" ]
+then
+  echo "First run"
+	set -x
+	docker run --name asylum_dev -i -p 8000:8000 -p 1080:1080 -v `pwd -P`/project:/opt/asylum asylum_dev
+  set +x
+else
+  set -x
+	docker start -i asylum_dev
+  set +x
+fi

docker/run_unit_tests.sh

@@ -1,4 +1,8 @@
-#!/usr/bin/env bash
+#!/bin/bash -e
+SCRIPTDIR=$(python -c 'import os,sys;print os.path.dirname(os.path.realpath(sys.argv[1]))' "$0")
+
+# Make sure we're in the correct place relative to Dockerfile no matter where we were called from
+cd `dirname "$SCRIPTDIR"`
 
 docker build -t asylum_test .
 docker run --rm --name asylum_test -it asylum_test ./run_tests.sh

docker/start.sh

@@ -6,6 +6,6 @@ cd `dirname "$SCRIPTDIR"`
 
 docker build -t asylum_test .
 echo "Starting test server."
-echo "To connect to shell in this instance run: docker exec -it $(docker ps | grep asylum_test | awk '{print $1}') /bin/bash"
+echo "To connect to shell in this instance run: docker exec -it asylum_test /bin/bash"
 echo "Then in that shell run: source ../asylum-venv/bin/activate"
 docker run --rm --name asylum_test -it -p 8000:8000 -p 1080:1080 asylum_test

project/access/models.py

@@ -18,6 +18,7 @@ class Meta:
         verbose_name_plural = _('Token Types')
         ordering = ['label', ]
 
+
 revisions.default_revision_manager.register(TokenType)
 
 
@@ -43,6 +44,7 @@ class Meta:
         unique_together = ("ttype", "value")
         ordering = ['owner__lname', 'owner__fname', 'ttype__label']
 
+
 revisions.default_revision_manager.register(Token)
 
 
@@ -59,6 +61,7 @@ class Meta:
         verbose_name_plural = _('Access Types')
         ordering = ['label', ]
 
+
 revisions.default_revision_manager.register(AccessType)
 
 
@@ -76,6 +79,7 @@ class Meta:
         unique_together = ('owner', 'atype')
         ordering = ['owner__lname', 'owner__fname', 'atype__label']
 
+
 revisions.default_revision_manager.register(Grant)
 
 
@@ -104,4 +108,5 @@ class Meta:
         unique_together = ("ttype", "value")
         ordering = ['contact', 'ttype__label']
 
+
 revisions.default_revision_manager.register(NonMemberToken)

project/bower.json

@@ -10,9 +10,6 @@
   "dependencies": {
     "bootstrap": "3.3.5",
     "font-awesome": "~4.4.0",
-    "jquery": "~2.1.4",
-    "jquery.scrollTo": "~2.1.2",
-    "scrollreveal": "scroll-reveal#~2.3.2",
-    "vide": "~0.4.1"
+    "jquery": "~2.1.4"
   }
 }

project/config/wsgi.py

@@ -15,16 +15,18 @@
 
 """
 import os
+
 import environ
+from django.core.wsgi import get_wsgi_application
+from whitenoise.django import DjangoWhiteNoise
+
 ROOT_DIR = environ.Path(__file__) - 2  # (/a/b/myfile.py - 3 = /)
 env = environ.Env()
 # If the project root contains a .env file, read it
 if os.path.isfile(str(ROOT_DIR + '.env')):
     environ.Env.read_env(str(ROOT_DIR + '.env'))
 
 
-from django.core.wsgi import get_wsgi_application
-from whitenoise.django import DjangoWhiteNoise
 
 if env.bool('USE_SENTRY', False):
     from raven.contrib.django.raven_compat.middleware.wsgi import Sentry

project/creditor/models.py

@@ -27,6 +27,7 @@ class Meta:
         verbose_name_plural = _('Transaction Tags')
         ordering = ['label', ]
 
+
 revisions.default_revision_manager.register(TransactionTag)
 
 
@@ -56,6 +57,7 @@ class Meta:
         verbose_name_plural = _('Transactions')
         ordering = ['-stamp', 'reference']
 
+
 revisions.default_revision_manager.register(Transaction)
 
 
@@ -155,4 +157,5 @@ class Meta:
         verbose_name_plural = _('Recurring Transactions')
         ordering = ['owner__lname', 'owner__fname', '-start']
 
+
 revisions.default_revision_manager.register(RecurringTransaction)

project/docker-entrypoint.sh

@@ -13,15 +13,20 @@ VENV_DIR_PATH=/opt/asylum-venv/
 
 # make sure postgresql is running
 sudo -u postgres service postgresql start
+set +e
+export PGPASSWORD=asylum; while true; do psql -q asylum -c 'SELECT 1;' 1>/dev/null 2>&1 ; if [ "$?" -ne "0" ]; then echo "Waiting for psql"; sleep 1; else break; fi; done
+set -e
 
 # Start forego or execute a command in the virtualenv
 if [ "$#" -eq 0 ]; then
+  echo "Starting devel server"
   maildump --http-ip 0.0.0.0 -p ~/maildump.pid &
   npm run build
   npm run watch &
   NPM=$!
   ./manage.py runserver 0.0.0.0:8000
   maildump -p ~/maildump.pid --stop
 else
+  echo "Calling $@"
   "$@"
 fi