[TASK] move docker CMD command to separate file

Signed-off-by: Jerome Jutteau <jerome@jutteau.fr>

diff --git a/Dockerfile b/Dockerfile
index f0071d0679aa563b3b4371cfd021427686f21d09..b710a852049c134b029afada87e495bc471ee789 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,17 +12,20 @@ RUN apk update && \
     echo "UTC" > /etc/timezone
 
 
     echo "UTC" > /etc/timezone
 
 

-# install jirafou
+# install jirafeau

 RUN mkdir /www
 WORKDIR /www
 COPY .git .git
 RUN apk add git && \
 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 && \
     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 && \
 
 # 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/*
 
 
 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
 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 (executable)
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