Corrections de bugs

pica-etherpad/Dockerfile

@@ -33,7 +33,6 @@ RUN curl -SL https://github.com/ether/etherpad-lite/archive/${ETHERPAD_VERSION}.
     mv etherpad-lite-${ETHERPAD_VERSION}/* . && \
     mkdir -p src/templates && \
     bin/installDeps.sh && \
-    rm settings.json && \
     npm install \
         ep_align \
         ep_author_hover \
@@ -50,6 +49,7 @@ RUN curl -SL https://github.com/ether/etherpad-lite/archive/${ETHERPAD_VERSION}.
         ep_table_of_contents \
         ep_user_font_size && \
     git clone https://framagit.org/DeBugs/picasoft-etherpad-landing-page.git src/templates/picasoft-etherpad-landing-page && \
+    rm package-lock.json && \
     git --git-dir=src/templates/picasoft-etherpad-landing-page/.git checkout ${ETHERPAD_LANDING_PAGE_VERSION} && \
     cp src/templates/picasoft-etherpad-landing-page/index.html src/templates/index.html && \
     cp src/templates/picasoft-etherpad-landing-page/static/* src/static/ -r
@@ -60,11 +60,7 @@ FROM base
 
 COPY entrypoint.sh /opt/etherpad-lite/entrypoint.sh
 RUN apt-get update && \
-    apt-get remove -y curl && \
-    apt-get -y autoclean && \
-    apt-get -y clean && \
-    apt-get -y autoremove && \
-    apt-get install -y mysql-client wget && \
+    apt-get install -y mysql-client && \
     chmod +x /opt/etherpad-lite/entrypoint.sh && \
     mkdir -p /opt/etherpad-lite && \
     chown -R node /opt/etherpad-lite && \
@@ -77,7 +73,7 @@ COPY --from=downloader --chown=node /opt/etherpad-lite /opt/etherpad-lite/
 USER node
 ENTRYPOINT ["/opt/etherpad-lite/entrypoint.sh"]
 CMD /bin/bash -c "/opt/etherpad-lite/bin/run.sh"
-HEALTHCHECK CMD wget -q -O /dev/null http://127.0.0.1:${ETHERPAD_PORT:=8080}
+HEALTHCHECK CMD curl -s 127.0.0.1:${ETHERPAD_PORT:=8080} 
 
 EXPOSE 8080
 VOLUME /opt/etherpad-lite/var

pica-etherpad/entrypoint.sh

@@ -39,40 +39,38 @@ if [ "$RESULT" != $ETHERPAD_DB_NAME ]; then
 	      -e "create database ${ETHERPAD_DB_NAME}"
 fi
 
-if [ ! -f /opt/etherpad-lite/settings.json ]; then
-
-	cat <<- EOF > /opt/etherpad-lite/settings.json
-	{
-	  "title": "${ETHERPAD_TITLE}",
-	  "ip": "0.0.0.0",
-	  "port" :${ETHERPAD_PORT},
-	  "dbType" : "mysql",
-	  "dbSettings" : {
-			    "user"    : "${ETHERPAD_DB_USER}",
-			    "host"    : "${MYSQL_PORT_3306_TCP_ADDR}",
-			    "password": "${ETHERPAD_DB_PASSWORD}",
-			    "database": "${ETHERPAD_DB_NAME}",
-			    "charset" : "utf8mb4"
-			  },
-	EOF
+cat <<- EOF > /opt/etherpad-lite/settings.json
+{
+  "title": "${ETHERPAD_TITLE}",
+  "ip": "0.0.0.0",
+  "port" :${ETHERPAD_PORT},
+  "dbType" : "mysql",
+  "dbSettings" : {
+		    "user"    : "${ETHERPAD_DB_USER}",
+		    "host"    : "${MYSQL_PORT_3306_TCP_ADDR}",
+		    "password": "${ETHERPAD_DB_PASSWORD}",
+		    "database": "${ETHERPAD_DB_NAME}",
+		    "charset" : "utf8mb4"
+		  },
+EOF
 
-	if [ $ETHERPAD_ADMIN_PASSWORD ]; then
+if [ $ETHERPAD_ADMIN_PASSWORD ]; then
 
-		: ${ETHERPAD_ADMIN_USER:=admin}
-
-		cat <<- EOF >> /opt/etherpad-lite/settings.json
-		  "users": {
-		    "${ETHERPAD_ADMIN_USER}": {
-		      "password": "${ETHERPAD_ADMIN_PASSWORD}",
-		      "is_admin": true
-		    }
-		  },
-		EOF
-	fi
+	: ${ETHERPAD_ADMIN_USER:=admin}
 
 	cat <<- EOF >> /opt/etherpad-lite/settings.json
-	}
+	  "users": {
+	    "${ETHERPAD_ADMIN_USER}": {
+	      "password": "${ETHERPAD_ADMIN_PASSWORD}",
+	      "is_admin": true
+	    }
+	  },
 	EOF
 fi
 
+cat <<- EOF >> /opt/etherpad-lite/settings.json
+}
+EOF
+
+
 exec "$@"