Merge pull request #7310 from Budibase/jonny/single-image-data-path

fix sed apostrophe error and couchdb path
This commit is contained in:
Jonny McCullagh 2022-08-16 20:13:01 +01:00 committed by GitHub
commit fcd9248d48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 4 deletions

View File

@ -11,6 +11,10 @@ if [[ "${TARGETBUILD}" = "aas" ]]; then
apt-get install -y openssh-server apt-get install -y openssh-server
sed -i "s/#Port 22/Port 2222/" /etc/ssh/sshd_config sed -i "s/#Port 22/Port 2222/" /etc/ssh/sshd_config
/etc/init.d/ssh restart /etc/init.d/ssh restart
fi sed -i "s#DATA_DIR#/home#g" /opt/clouseau/clouseau.ini
sed -i "s#DATA_DIR#/home#g" /opt/couchdb/etc/local.ini
else
sed -i "s#DATA_DIR#/data#g" /opt/clouseau/clouseau.ini
sed -i "s#DATA_DIR#/data#g" /opt/couchdb/etc/local.ini
sed -i 's#DATA_DIR#$DATA_DIR#' /opt/clouseau/clouseau.ini /opt/couchdb/etc/local.ini fi

View File

@ -1,5 +1,5 @@
; CouchDB Configuration Settings ; CouchDB Configuration Settings
[couchdb] [couchdb]
database_dir = DATA_DIR/couch/dbs database_dir = DATA_DIR/couchdb/dbs
view_index_dir = DATA_DIR/couch/views view_index_dir = DATA_DIR/couchdb/views

View File

@ -3,6 +3,11 @@ healthy=true
if [ -f "/data/.env" ]; then if [ -f "/data/.env" ]; then
export $(cat /data/.env | xargs) export $(cat /data/.env | xargs)
elif [ -f "/home/.env" ]; then
export $(cat /home/.env | xargs)
else
echo "No .env file found"
healthy=false
fi fi
if [[ $(curl -Lfk -s -w "%{http_code}\n" http://localhost/ -o /dev/null) -ne 200 ]]; then if [[ $(curl -Lfk -s -w "%{http_code}\n" http://localhost/ -o /dev/null) -ne 200 ]]; then