diff --git a/docker-compose.yml b/docker-compose.yml index 39e3dde4..b9f23b1d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ nginx: - /etc/letsencrypt:/etc/letsencrypt - /tmp:/tmp webapp: - image: "selcolumbia/dokomoforms" + image: "selcolumbia/dokomoforms:0.2.2" command: bash -c "./docker-wait-for-postgres.sh db && head -c 24 /dev/urandom > cookie_secret && python webapp.py" links: - "db:db" diff --git a/docker-wait-for-postgres.sh b/docker-wait-for-postgres.sh index 6c796cb0..b2c7c907 100755 --- a/docker-wait-for-postgres.sh +++ b/docker-wait-for-postgres.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh until psql --host=$1 --username=postgres -w &>/dev/null do echo "Waiting for PostgreSQL..." diff --git a/installer.sh b/installer.sh index 05476666..4a33e879 100755 --- a/installer.sh +++ b/installer.sh @@ -158,4 +158,7 @@ printf " You can view the status of the \n" printf " containers by running: \n" printf " $DOCKER_COMPOSE ps\n" printf "========================================\n" +if [ -f /etc/redhat-release ] ; then + chcon -Rt svirt_sandbox_file_t . +fi $DOCKER_COMPOSE up -d