diff --git a/TODO b/TODO deleted file mode 100644 index c17f091..0000000 --- a/TODO +++ /dev/null @@ -1,2 +0,0 @@ -TODO later -- dependencies between containers and check if its is working diff --git a/srcs/docker-compose.yml b/srcs/docker-compose.yml index ec35e7d..b9dca18 100644 --- a/srcs/docker-compose.yml +++ b/srcs/docker-compose.yml @@ -7,7 +7,8 @@ services: ports: - 4433:443 depends_on: - - wordpress + wordpress: + condition: service_healthy volumes: - www:/www:ro # domainname: mcolonna.42.fr # TODO(vm) useful? # TODO(any)(nocopy) @@ -17,7 +18,8 @@ services: volumes: - www:/www:rw depends_on: - - mariadb + mariadb: + condition: service_healthy mariadb: build: ./requirements/mariadb diff --git a/srcs/requirements/mariadb/Dockerfile b/srcs/requirements/mariadb/Dockerfile index 116af2e..16f1044 100644 --- a/srcs/requirements/mariadb/Dockerfile +++ b/srcs/requirements/mariadb/Dockerfile @@ -20,3 +20,5 @@ EXPOSE 3306 # start CMD ["/run.sh"] #CMD ["ls", "-AlF", "/"] + +HEALTHCHECK --interval=1s --timeout=10s --start-period=600s --retries=1 CMD [ "sh", "-c", "! [ -z \"$(netstat -tuln | grep :3306)\" ]" ] diff --git a/srcs/requirements/nginx/Dockerfile b/srcs/requirements/nginx/Dockerfile index 70a88e2..ca58b5f 100644 --- a/srcs/requirements/nginx/Dockerfile +++ b/srcs/requirements/nginx/Dockerfile @@ -29,3 +29,5 @@ COPY conf/ /etc/nginx/ # start CMD ["nginx", "-g", "daemon off;"] + +HEALTHCHECK --interval=1s --timeout=10s --start-period=60s --retries=1 CMD [ "sh", "-c", "! [ -z \"$(netstat -tuln | grep :443)\" ]" ] diff --git a/srcs/requirements/wordpress/Dockerfile b/srcs/requirements/wordpress/Dockerfile index a1358a0..a16d922 100644 --- a/srcs/requirements/wordpress/Dockerfile +++ b/srcs/requirements/wordpress/Dockerfile @@ -24,3 +24,5 @@ COPY /run.sh /run.sh # start CMD ["/run.sh"] + +HEALTHCHECK --interval=1s --timeout=10s --start-period=3600s --retries=1 CMD [ "sh", "-c", "! [ -z \"$(netstat -tuln | grep :9000)\" ]" ]