From 7d011f5ca5619d0d361dcf4d35c295f5bc2f8268 Mon Sep 17 00:00:00 2001 From: mappuji Date: Sat, 26 May 2018 01:20:20 +0700 Subject: [PATCH 1/8] modify db-init entrypoint to support user and password --- docker/db-init/docker-entrypoint.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docker/db-init/docker-entrypoint.sh b/docker/db-init/docker-entrypoint.sh index 381bbec848..487deb950d 100755 --- a/docker/db-init/docker-entrypoint.sh +++ b/docker/db-init/docker-entrypoint.sh @@ -18,4 +18,12 @@ done add-cors-to-couchdb $COUCHDB_HOST #MIGRATOR -./couchdb-setup.sh -p 5984 -h couchdb +if [[ -z "${COUCHDB_USER}" ]]; then + ./couchdb-setup.sh -p 5984 -h couchdb + else + if [[ -z "${COUCHDB_PASS}" ]]; then + echo "The COUCHDB_PASS is not set. Exiting..." + else + ./couchdb-setup.sh -p 5984 -h couchdb -u $COUCHDB_USER -w $COUCHDB_PASS + fi +fi From 2a62e7191210520485cf81137f64eec53d2af04c Mon Sep 17 00:00:00 2001 From: mappuji Date: Sat, 26 May 2018 01:23:35 +0700 Subject: [PATCH 2/8] avoid hardcoding couchdb_host --- docker/db-init/docker-entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/db-init/docker-entrypoint.sh b/docker/db-init/docker-entrypoint.sh index 487deb950d..042297797b 100755 --- a/docker/db-init/docker-entrypoint.sh +++ b/docker/db-init/docker-entrypoint.sh @@ -19,11 +19,11 @@ add-cors-to-couchdb $COUCHDB_HOST #MIGRATOR if [[ -z "${COUCHDB_USER}" ]]; then - ./couchdb-setup.sh -p 5984 -h couchdb + ./couchdb-setup.sh -p 5984 -h $COUCHDB_HOST else if [[ -z "${COUCHDB_PASS}" ]]; then echo "The COUCHDB_PASS is not set. Exiting..." else - ./couchdb-setup.sh -p 5984 -h couchdb -u $COUCHDB_USER -w $COUCHDB_PASS + ./couchdb-setup.sh -p 5984 -h $COUCHDB_HOST -u $COUCHDB_USER -w $COUCHDB_PASS fi fi From 8144434ffdd9956f9a55e73f623108880c8953e6 Mon Sep 17 00:00:00 2001 From: mappuji Date: Sat, 26 May 2018 02:12:10 +0700 Subject: [PATCH 3/8] avoid hardcoding couchdb_host, 2 --- docker/db-init/docker-entrypoint.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docker/db-init/docker-entrypoint.sh b/docker/db-init/docker-entrypoint.sh index 042297797b..bd46210ae7 100755 --- a/docker/db-init/docker-entrypoint.sh +++ b/docker/db-init/docker-entrypoint.sh @@ -2,9 +2,12 @@ if [ -z $COUCHDB_HOST ]; then echo '$COUCHDB_HOST is not set, defaulting to' 'http://couchdb:5984' - export $COUCHDB_HOST='http://couchdb:5984' + export COUCHDB_HOST='http://couchdb:5984' fi +export COUCHDB_DOMAIN=$(basename $COUCHDB_HOST) +export COUCHDB_PORT=$(cho $COUCHDB_HOST | sed -e 's,^.*:,:,g' -e 's,.*:\([0-9]*\).*,\1,g' -e 's,[^0-9],,g') + #WAIT_TIME echo "Waiting for couchdb to start" WAIT_TIME=0 @@ -19,11 +22,11 @@ add-cors-to-couchdb $COUCHDB_HOST #MIGRATOR if [[ -z "${COUCHDB_USER}" ]]; then - ./couchdb-setup.sh -p 5984 -h $COUCHDB_HOST + ./couchdb-setup.sh -p $COUCHDB_PORT -h $COUCHDB_DOMAIN else if [[ -z "${COUCHDB_PASS}" ]]; then echo "The COUCHDB_PASS is not set. Exiting..." else - ./couchdb-setup.sh -p 5984 -h $COUCHDB_HOST -u $COUCHDB_USER -w $COUCHDB_PASS + ./couchdb-setup.sh -p $COUCHDB_PORT -h $COUCHDB_DOMAIN -u $COUCHDB_USER -w $COUCHDB_PASS fi fi From 7f4f2c8b6bd52549e1c5bc76360b6d7dccbcdbe1 Mon Sep 17 00:00:00 2001 From: mappuji Date: Sat, 26 May 2018 02:30:10 +0700 Subject: [PATCH 4/8] avoid hardcoding couchdb_host, 4 --- docker/db-init/docker-entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/db-init/docker-entrypoint.sh b/docker/db-init/docker-entrypoint.sh index bd46210ae7..7ecd4cb19a 100755 --- a/docker/db-init/docker-entrypoint.sh +++ b/docker/db-init/docker-entrypoint.sh @@ -5,8 +5,8 @@ if [ -z $COUCHDB_HOST ]; then export COUCHDB_HOST='http://couchdb:5984' fi -export COUCHDB_DOMAIN=$(basename $COUCHDB_HOST) -export COUCHDB_PORT=$(cho $COUCHDB_HOST | sed -e 's,^.*:,:,g' -e 's,.*:\([0-9]*\).*,\1,g' -e 's,[^0-9],,g') +export COUCHDB_DOMAIN=$(sed -E -e 's_.*://([^/@]*@)?([^/:]+).*_\2_' <<< $COUCHDB_HOST) +export COUCHDB_PORT=$(echo $COUCHDB_HOST | sed -e 's,^.*:,:,g' -e 's,.*:\([0-9]*\).*,\1,g' -e 's,[^0-9],,g') #WAIT_TIME echo "Waiting for couchdb to start" From 954a6cd7b518c0a4ac6b669bd3405f423722c103 Mon Sep 17 00:00:00 2001 From: mappuji Date: Sat, 26 May 2018 02:46:59 +0700 Subject: [PATCH 5/8] avoid hardcoding couchdb_host, use bash --- docker/db-init/docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/db-init/docker-entrypoint.sh b/docker/db-init/docker-entrypoint.sh index 7ecd4cb19a..3fc26b7cd2 100755 --- a/docker/db-init/docker-entrypoint.sh +++ b/docker/db-init/docker-entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash if [ -z $COUCHDB_HOST ]; then echo '$COUCHDB_HOST is not set, defaulting to' 'http://couchdb:5984' From 674b3e3121467962cc4947db46a1f819aeaa30a8 Mon Sep 17 00:00:00 2001 From: mappuji Date: Sat, 26 May 2018 03:03:07 +0700 Subject: [PATCH 6/8] avoid hardcoding couchdb_host, use bash! --- docker/db-init/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/db-init/Dockerfile b/docker/db-init/Dockerfile index 47f40cf99c..ab5210f2a5 100644 --- a/docker/db-init/Dockerfile +++ b/docker/db-init/Dockerfile @@ -11,4 +11,4 @@ COPY ./docker/db-init/docker-entrypoint.sh /root/docker-entrypoint.sh COPY ./couchdb-setup.sh /root/couchdb-setup.sh ADD ./design /root/design -CMD sh ./docker-entrypoint.sh +CMD bash ./docker-entrypoint.sh From 4be1b2a706236d8c1aacd2dcd760b9dc15d4f986 Mon Sep 17 00:00:00 2001 From: mappuji Date: Tue, 29 May 2018 22:21:53 +0700 Subject: [PATCH 7/8] use bash in rpi --- docker/db-init/crosscompile_db-init.sh | 0 docker/db-init/rpi-Dockerfile | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 docker/db-init/crosscompile_db-init.sh diff --git a/docker/db-init/crosscompile_db-init.sh b/docker/db-init/crosscompile_db-init.sh old mode 100644 new mode 100755 diff --git a/docker/db-init/rpi-Dockerfile b/docker/db-init/rpi-Dockerfile index 6be54f4571..0deb12facf 100644 --- a/docker/db-init/rpi-Dockerfile +++ b/docker/db-init/rpi-Dockerfile @@ -21,4 +21,4 @@ COPY ./docker/db-init/docker-entrypoint.sh /root/docker-entrypoint.sh COPY ./couchdb-setup.sh /root/couchdb-setup.sh ADD ./design /root/design -CMD sh ./docker-entrypoint.sh +CMD bash ./docker-entrypoint.sh From 38dd4abe88a7bc3b4c303fde49030fe2af61d5a6 Mon Sep 17 00:00:00 2001 From: mappuji Date: Tue, 29 May 2018 22:24:19 +0700 Subject: [PATCH 8/8] use echo instead in redirection --- docker/db-init/docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/db-init/docker-entrypoint.sh b/docker/db-init/docker-entrypoint.sh index 3fc26b7cd2..e78890850d 100755 --- a/docker/db-init/docker-entrypoint.sh +++ b/docker/db-init/docker-entrypoint.sh @@ -5,7 +5,7 @@ if [ -z $COUCHDB_HOST ]; then export COUCHDB_HOST='http://couchdb:5984' fi -export COUCHDB_DOMAIN=$(sed -E -e 's_.*://([^/@]*@)?([^/:]+).*_\2_' <<< $COUCHDB_HOST) +export COUCHDB_DOMAIN=$(echo $COUCHDB_HOST | sed -E -e 's_.*://([^/@]*@)?([^/:]+).*_\2_') export COUCHDB_PORT=$(echo $COUCHDB_HOST | sed -e 's,^.*:,:,g' -e 's,.*:\([0-9]*\).*,\1,g' -e 's,[^0-9],,g') #WAIT_TIME