Skip to content

Commit

Permalink
Tidying up
Browse files Browse the repository at this point in the history
  • Loading branch information
vr2262 committed Dec 16, 2015
1 parent a7b7d56 commit 9b47c26
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docker-wait-for-postgres.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/usr/bin/env sh
until psql --host=$1 --username=postgres -w &>/dev/null
do
echo "Waiting for PostgreSQL..."
Expand Down
3 changes: 3 additions & 0 deletions installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 9b47c26

Please sign in to comment.