Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F3943219
D1775.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
2 KB
Referenced Files
None
Subscribers
None
D1775.diff
View Options
diff --git a/Dockerfile b/Dockerfile
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,13 +21,10 @@
npm install ep_author_neat && \
rm settings.json
-COPY entrypoint.sh /entrypoint.sh
-
VOLUME /opt/etherpad-lite/var
RUN ln -s /opt/etherpad-lite/var/settings.json /opt/etherpad-lite/settings.json
WORKDIR /opt/etherpad-lite
EXPOSE 9001
-ENTRYPOINT ["/entrypoint.sh"]
CMD ["bin/run.sh", "--root"]
diff --git a/entrypoint.sh b/entrypoint.sh
deleted file mode 100755
--- a/entrypoint.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/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}
-if [ "$ETHERPAD_DB_USER" = 'root' ]; then
- : ${ETHERPAD_DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD}
-fi
-: ${ETHERPAD_DB_NAME:=etherpad}
-
-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
- {
- "title": "${ETHERPAD_TITLE}",
- "ip": "0.0.0.0",
- "port" :${ETHERPAD_PORT},
- "sessionKey" : "${ETHERPAD_SESSION_KEY}",
- "dbType" : "mysql",
- "dbSettings" : {
- "user" : "${ETHERPAD_DB_USER}",
- "host" : "mysql",
- "password": "${ETHERPAD_DB_PASSWORD}",
- "database": "${ETHERPAD_DB_NAME}"
- },
- EOF
-
- if [ $ETHERPAD_ADMIN_PASSWORD ]; then
-
- : ${ETHERPAD_ADMIN_USER:=admin}
-
- cat <<- EOF >> settings.json
- "users": {
- "${ETHERPAD_ADMIN_USER}": {
- "password": "${ETHERPAD_ADMIN_PASSWORD}",
- "is_admin": true
- }
- },
- EOF
- fi
-
- cat <<- EOF >> settings.json
- }
- EOF
-fi
-
-exec "$@"
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Dec 26, 05:32 (12 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2315524
Default Alt Text
D1775.diff (2 KB)
Attached To
Mode
D1775: Don't check database or provision settings at container startup
Attached
Detach File
Event Timeline
Log In to Comment