aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
diff options
context:
space:
mode:
authorVirtualTam <virtualtam@flibidi.net>2017-04-09 14:50:13 +0200
committerVirtualTam <virtualtam@flibidi.net>2017-10-03 19:47:01 +0200
commit1a216faecb5c114afbf36ecbac8ec3f795309eba (patch)
treef02b0c42192ebcfdd99b4d3d636e28a4d91b0399 /Makefile
parent2f69b6d04e399bd3efae0f12b8ad8c148fabf350 (diff)
downloadShaarli-1a216faecb5c114afbf36ecbac8ec3f795309eba.tar.gz
Shaarli-1a216faecb5c114afbf36ecbac8ec3f795309eba.tar.zst
Shaarli-1a216faecb5c114afbf36ecbac8ec3f795309eba.zip
docker: switch to Alpine Linux for the master image
Relates to https://github.com/shaarli/Shaarli/issues/843 Changed: - switch base image from Debian:Jessie to Alpine:3.6 - switch to PHP 7.1 - switch from supervisord to s6 to manage services See: - https://alpinelinux.org/ - https://wiki.alpinelinux.org/wiki/Nginx_with_PHP - http://www.skarnet.org/software/s6/ - http://www.skarnet.org/software/s6/s6-svscan.html - http://www.skarnet.org/software/s6/s6-svc.html - http://www.skarnet.org/software/s6/s6-svstat.html Signed-off-by: VirtualTam <virtualtam@flibidi.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index a3696ec9..656c27b0 100644
--- a/Makefile
+++ b/Makefile
@@ -115,7 +115,7 @@ check_permissions:
115 @echo "----------------------" 115 @echo "----------------------"
116 @echo "Check file permissions" 116 @echo "Check file permissions"
117 @echo "----------------------" 117 @echo "----------------------"
118 @for file in `git ls-files`; do \ 118 @for file in `git ls-files | grep -v docker`; do \
119 if [ -x $$file ]; then \ 119 if [ -x $$file ]; then \
120 errors=true; \ 120 errors=true; \
121 echo "$${file} is executable"; \ 121 echo "$${file} is executable"; \