From 579b9998ee4e7b082c6ceb169ecccf6c46dcc102 Mon Sep 17 00:00:00 2001 From: William Miceli <1-WilliamMiceli@git.williammiceli.systems> Date: Thu, 28 Mar 2019 18:13:43 -0400 Subject: [PATCH] Tini is apparently included in docker now --- Dockerfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 648d472..9d0f33d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,9 +15,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # php-json \ # php-mbstring -ADD https://github.com/krallin/tini/releases/download/v0.13.2/tini /usr/local/bin/tini -RUN chmod +x /usr/local/bin/tini - # Install grav WORKDIR /var/www RUN mkdir -p /var/www \ @@ -42,4 +39,10 @@ RUN usermod -aG www-data nginx # Run startup script ADD resources / -ENTRYPOINT [ "/usr/local/bin/tini", "--", "/usr/local/bin/startup.sh" ] \ No newline at end of file + +EXPOSE 80 +STOPSIGNAL SIGTERM + +ENTRYPOINT [ "--" ] +# Temporarily removed , "/usr/local/bin/startup.sh" +# CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file