D1775.id4502.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D1775.id4502.diff
View Options

	diff --git a/entrypoint.sh b/entrypoint.sh
	--- a/entrypoint.sh
	+++ b/entrypoint.sh
	@@ -1,12 +1,6 @@
	#!/bin/bash
	set -e

	-if [ -z "$MYSQL_PORT_3306_TCP_ADDR" ]; then
	- echo >&2 'error: missing MYSQL_PORT_3306_TCP environment variable'
	- echo >&2 ' Did you forget to --link some_mysql_container:mysql ?'
	- exit 1
	-fi
	-
	# if we're linked to MySQL, and we're using the root user, and our linked
	# container has a default "root" password set up and passed through... :)
	: ${ETHERPAD_DB_USER:=root}
	@@ -17,32 +11,11 @@

	ETHERPAD_DB_NAME=$( echo $ETHERPAD_DB_NAME \| sed 's/\./_/g' )

	-if [ -z "$ETHERPAD_DB_PASSWORD" ]; then
	- echo >&2 'error: missing required ETHERPAD_DB_PASSWORD environment variable'
	- echo >&2 ' Did you forget to -e ETHERPAD_DB_PASSWORD=... ?'
	- echo >&2
	- echo >&2 ' (Also of interest might be ETHERPAD_DB_USER and ETHERPAD_DB_NAME.)'
	- exit 1
	-fi
	-
	: ${ETHERPAD_TITLE:=Etherpad}
	: ${ETHERPAD_PORT:=9001}
	: ${ETHERPAD_SESSION_KEY:=$(
	node -p "require('crypto').randomBytes(32).toString('hex')")}

	-# Check if database already exists
	-RESULT=`mysql -u${ETHERPAD_DB_USER} -p${ETHERPAD_DB_PASSWORD} \
	- -hmysql --skip-column-names \
	- -e "SHOW DATABASES LIKE '${ETHERPAD_DB_NAME}'"`
	-
	-if [ "$RESULT" != $ETHERPAD_DB_NAME ]; then
	- # mysql database does not exist, create it
	- echo "Creating database ${ETHERPAD_DB_NAME}"
	-
	- mysql -u${ETHERPAD_DB_USER} -p${ETHERPAD_DB_PASSWORD} -hmysql \
	- -e "create database ${ETHERPAD_DB_NAME}"
	-fi
	-
	if [ ! -f settings.json ]; then

	cat <<- EOF > settings.json