Merge branch 'master' of https://github.com/OperationCode/resources_api

Author: wimo7083

.travis.yml

@@ -1,6 +1,7 @@
 env:
   global:
     - SQLALCHEMY_DATABASE_URI="sqlite:///:memory:"
+    - IMAGE_NAME=resources-api
 language: python
 sudo: required
 dist: xenial
@@ -33,10 +34,10 @@ script:
   - 'make test'
   - 'make lint'
 
+after_success:
+  - bash bin/run.sh
+
 after_script:
   - docker-compose run resources-api coverage xml
   - docker-compose -f docker-compose.yml down
   - if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]; then ./cc-test-reporter -r 147d129d98f3d606ce69bc151bbeded40dc684fe11e0f5a831f11f6b36680b22 after-build --exit-code $TRAVIS_TEST_RESULT; fi
-
-after_success:
-  - bash bin/run.sh

bin/build

@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
 set -eu
-# import util functions
-source "${SCRIPTDIR}/../lib/util.sh"
+
+echo "IMAGE_NAME $IMAGE_NAME"
+IMAGE_NAME="resources-api"
 
 echo "Building Docker image..."
-runCommand "docker build -t $IMAGE_NAME -f Dockerfile ." || exit $?
+docker build -t $IMAGE_NAME -f Dockerfile . || exit $?

bin/publish

@@ -6,6 +6,8 @@
 
 set -eu
 
+echo "IMAGE_NAME $IMAGE_NAME"
+
 DOCKER_REPO="operationcode/resources-api"
 IMAGE_NAME="resources-api"
 

configs.py

@@ -28,10 +28,14 @@ def get_sys_exec_root_or_drive():
 if not postgres_db:
     raise KeyError("Application requires 'POSTGRES_DB' to run")
 
+postgres_host = os.environ.get('POSTGRES_HOST')
+if not postgres_host:
+    raise KeyError("Application requires 'POSTGRES_HOST' to run")
+
 
 class Config:
     SQLALCHEMY_TRACK_MODIFICATIONS = False
-    SQLALCHEMY_DATABASE_URI = f"postgresql://{postgres_user}:{postgres_password}@{postgres_db}:5432/{postgres_db}"
+    SQLALCHEMY_DATABASE_URI = f"postgresql://{postgres_user}:{postgres_password}@{postgres_host}:5432/{postgres_db}"
 
     # Can pass in changes to defaults, such as PaginatorConfig(per_page=40)
     RESOURCE_PAGINATOR = PaginatorConfig()

docker-compose.yml

@@ -23,6 +23,7 @@ services:
     - POSTGRES_USER=${POSTGRES_USER}
     - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     - POSTGRES_DB=${POSTGRES_DB}
+    - POSTGRES_HOST=${POSTGRES_HOST}
     ports:
     - 5432:5432
     volumes: