From ea35d9cbf21948b03a9aba457f6b8d5242d8a7c0 Mon Sep 17 00:00:00 2001 From: Wesley Kerfoot Date: Sun, 14 Apr 2019 01:13:03 -0400 Subject: [PATCH] Fix docker entrypoint scripts --- app/run.sh | 8 ++++---- app/scripts/app.tag | 4 ++-- docker-compose.yml | 4 ++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/run.sh b/app/run.sh index a82f221..05b4593 100644 --- a/app/run.sh +++ b/app/run.sh @@ -1,11 +1,11 @@ #! /bin/bash -curl localhost:5984 2> /dev/null +curl 127.0.0.1:5984 2> /dev/null while [ $? != 0 ]; do - curl localhost:5984 2> /dev/null + curl 127.0.0.1:5984 2> /dev/null sleep 5; done -curl -XPUT http://$COUCHDB_USER:$COUCHDB_PASSWORD@localhost:5984/$COUCHDB_NAME || true -curl -XPUT http://$COUCHDB_USER:$COUCHDB_PASSWORD@localhost:5984/$COUCHDB_NAME/_design/blogPosts -d @/blogPosts.json || true +curl -XPUT http://$COUCHDB_USER:$COUCHDB_PASSWORD@127.0.0.1:5984/$COUCHDB_NAME || true +curl -XPUT http://$COUCHDB_USER:$COUCHDB_PASSWORD@127.0.0.1:5984/$COUCHDB_NAME/_design/blogPosts -d @/blogPosts.json || true exec python3 "$@" diff --git a/app/scripts/app.tag b/app/scripts/app.tag index b4e0ca3..886ce47 100644 --- a/app/scripts/app.tag +++ b/app/scripts/app.tag @@ -246,9 +246,9 @@ menuOff(ev) { self.titles = { "browse" : "Wesley Kerfoot", - "projects" : "Software", + "projects" : "GitHub Projects", "links" : "Links", - "about" : "About Me" + "about" : "Who am I?" }; function activate(page) { diff --git a/docker-compose.yml b/docker-compose.yml index 51f1f9f..ad217ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,3 +19,7 @@ services: - ".env" depends_on: - "couch" + environment: + - "COUCHDB_USER" + - "COUCHDB_PASSWORD" + - "COUCHDB_NAME"