diff --git a/pica-etherpad/Dockerfile b/pica-etherpad/Dockerfile index adf650df1db3414c498b6582bf6b9ac129100831..b7f9bfe933f02a04540943120f1a1222b6247f83 100644 --- a/pica-etherpad/Dockerfile +++ b/pica-etherpad/Dockerfile @@ -7,7 +7,7 @@ ENV ETHERPAD_VERSION 1.6.1 COPY add/entrypoint.sh /entrypoint.sh #Installation de NodeJS + NPM -RUN useradd -d /opt/etherpad-lite -u 1000 etherpad && \ +RUN useradd -d /opt/etherpad-lite -u 1000 etherpad && \ curl -sL https://deb.nodesource.com/setup_8.x | bash - && \ apt-get update && \ apt-get install -y nodejs unzip mysql-client && \ @@ -15,11 +15,11 @@ RUN useradd -d /opt/etherpad-lite -u 1000 etherpad && \ curl -SL https://github.com/ether/etherpad-lite/archive/${ETHERPAD_VERSION}.zip > etherpad.zip && \ unzip etherpad && \ rm -Rf etherpad.zip etherpad-lite-${ETHERPAD_VERSION}/.git && \ - mv etherpad-lite-${ETHERPAD_VERSION} /opt/etherpad-lite && \ + mv etherpad-lite-${ETHERPAD_VERSION} /opt/etherpad-lite && \ chown -R etherpad: /opt/etherpad-lite && \ chmod +x /entrypoint.sh -USER etherpad +USER etherpad WORKDIR /opt/etherpad-lite #First starting of services diff --git a/pica-etherpad/add/entrypoint.sh b/pica-etherpad/add/entrypoint.sh index efe85178cfda8de1174d54c63fd46b7465344e71..f7b8f35022deac6c568a26236c7447d32f1dd3b5 100644 --- a/pica-etherpad/add/entrypoint.sh +++ b/pica-etherpad/add/entrypoint.sh @@ -54,7 +54,8 @@ if [ ! -f settings.json ]; then "user" : "${ETHERPAD_DB_USER}", "host" : "${MYSQL_PORT_3306_TCP_ADDR}", "password": "${ETHERPAD_DB_PASSWORD}", - "database": "${ETHERPAD_DB_NAME}" + "database": "${ETHERPAD_DB_NAME}", + "charset" : "utf8mb4" }, EOF