From: Jerome Jutteau Date: Sun, 13 Dec 2020 19:39:47 +0000 (+0100) Subject: [TASK] move docker CMD command to separate file X-Git-Tag: 4.3.0~8 X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/commitdiff_plain/c6c5eb250b89da6fffea47f99f0e676fe6ca1e04?ds=inline;hp=dddcc255110ee8219bfb41943c6e4430a02139aa [TASK] move docker CMD command to separate file Signed-off-by: Jerome Jutteau --- diff --git a/Dockerfile b/Dockerfile index f0071d0..b710a85 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,17 +12,20 @@ RUN apk update && \ echo "UTC" > /etc/timezone -# install jirafou +# install jirafeau RUN mkdir /www WORKDIR /www COPY .git .git RUN apk add git && \ - git reset --hard && rm -rf .git .gitignore .gitlab-ci.yml CONTRIBUTING.md Dockerfile README.md && \ + git reset --hard && rm -rf docker .git .gitignore .gitlab-ci.yml CONTRIBUTING.md Dockerfile README.md && \ apk del git && \ chown -R $USER_UID.$GROUP_UID /www && \ - chmod o=,ug=rwX -R /www && \ - chmod +x docker/cleanup + chmod o=,ug=rwX -R /www +COPY docker/cleanup.sh /cleanup.sh +RUN chmod o=,ug=rx /cleanup.sh +COPY docker/run.sh /run.sh +RUN chmod o=,ug=rx /run.sh # install lighttpd RUN apk add lighttpd php7-mcrypt && \ @@ -38,5 +41,5 @@ COPY docker/lighttpd.conf /etc/lighttpd/lighttpd.conf RUN rm -rf /var/cache/apk/* -CMD /www/docker/cleanup & php-fpm -D && lighttpd -D -f /etc/lighttpd/lighttpd.conf +CMD /run.sh EXPOSE 80 \ No newline at end of file diff --git a/docker/cleanup b/docker/cleanup.sh similarity index 100% rename from docker/cleanup rename to docker/cleanup.sh diff --git a/docker/run.sh b/docker/run.sh new file mode 100755 index 0000000..a57fa3b --- /dev/null +++ b/docker/run.sh @@ -0,0 +1,4 @@ +#!/bin/sh -e +/cleanup.sh & +php-fpm -D +lighttpd -D -f /etc/lighttpd/lighttpd.conf