diff --git a/pica-etherpad/Dockerfile b/pica-etherpad/Dockerfile index c37ddc6dee25a9899a9fba0bd8aa6e7697225435..17f45c47c4e65a4f0aca230189d634369c19e94b 100644 --- a/pica-etherpad/Dockerfile +++ b/pica-etherpad/Dockerfile @@ -74,15 +74,14 @@ RUN apt-get update && \ mkdir -p /opt/etherpad-lite && \ chown -R node /opt/etherpad-lite && \ usermod -d /opt/etherpad-lite node && \ - rm -rf /var/lib/apt/lists/* + rm -rf /var/lib/apt/lists/* # import des fichiers téléchargés dans l'image downloader -COPY --from=downloader --chown=node /opt/etherpad-lite /opt/etherpad-lite/ +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 curl -s 127.0.0.1:${ETHERPAD_PORT:=8080} EXPOSE 8080 VOLUME /opt/etherpad-lite/var diff --git a/pica-etherpad/docker-compose.yml b/pica-etherpad/docker-compose.yml index daf375784cb2144c90ce7a98647b4e937c6fbb1d..01634c7e3e8c1fd4899c07f231bd2375b8feb732 100755 --- a/pica-etherpad/docker-compose.yml +++ b/pica-etherpad/docker-compose.yml @@ -45,11 +45,6 @@ services: volumes: - etherpad-db-volume:/var/lib/mysql env_file: ./secrets/etherpad-db.secrets - healthcheck: - test: "/usr/bin/mysql --user=root --password=$${MYSQL_ROOT_PASSWORD} --execute \"SHOW DATABASES;\"" - interval: 4s - timeout: 20s - retries: 10 restart: always networks: - - docker_default \ No newline at end of file + - docker_default