mirror_php/Jirafeau
1
0
Fork 0
mirror of https://gitlab.com/mojo42/Jirafeau.git synced 2025-04-21 04:01:51 +02:00
Code Issues Projects Releases Wiki Activity

[TASK] move docker CMD command to separate file

Browse Source 
Signed-off-by: Jerome Jutteau <jerome@jutteau.fr>
This commit is contained in:
Jerome Jutteau 2020-12-13 20:39:47 +01:00
parent dddcc25511
commit c6c5eb250b
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Dockerfile
View File

@ -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

0
docker/cleanup → docker/cleanup.sh
View File

4
docker/run.sh Executable file
View File

@ -0,0 +1,4 @@
#!/bin/sh -e
/cleanup.sh &
php-fpm -D
lighttpd -D -f /etc/lighttpd/lighttpd.conf