From a0a26af16779ca037c6b379d286a3c6051d3395d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Huet?= <remy.huet@etu.utc.fr> Date: Wed, 12 Jun 2019 13:18:56 +0200 Subject: [PATCH] Remove healthchecks --- pica-etherpad/Dockerfile | 5 ++--- pica-etherpad/docker-compose.yml | 7 +------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pica-etherpad/Dockerfile b/pica-etherpad/Dockerfile index c37ddc6d..17f45c47 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 daf37578..01634c7e 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 -- GitLab