]> git.immae.eu Git - github/shaarli/Shaarli.git/commit - Dockerfile
projects / github / shaarli / Shaarli.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2f69b6d) | patch
docker: switch to Alpine Linux for the master image
authorVirtualTam <virtualtam@flibidi.net>
Sun, 9 Apr 2017 12:50:13 +0000 (14:50 +0200)
committerVirtualTam <virtualtam@flibidi.net>
Tue, 3 Oct 2017 17:47:01 +0000 (19:47 +0200)
commit1a216faecb5c114afbf36ecbac8ec3f795309eba
treef02b0c42192ebcfdd99b4d3d636e28a4d91b0399tree | snapshot
parent2f69b6d04e399bd3efae0f12b8ad8c148fabf350commit | diff
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>
14 files changed:
Makefile diff | blob | blame | history
docker/alpine/Dockerfile.master [new file with mode: 0644] blob
docker/alpine/IMAGE.md [moved from docker/production/IMAGE.md with 100% similarity] blob | blame | history
docker/alpine/nginx.conf [moved from docker/production/stable/nginx.conf with 94% similarity] diff | blob | blame | history
docker/alpine/php-fpm.conf [new file with mode: 0644] blob
docker/alpine/services.d/.s6-svscan/finish [new file with mode: 0755] blob
docker/alpine/services.d/nginx/run [new file with mode: 0755] blob
docker/alpine/services.d/php-fpm/run [new file with mode: 0755] blob
docker/production/Dockerfile [deleted file] blob | blame | history
docker/production/supervised.conf [deleted file] blob | blame | history
docker/stable/Dockerfile [moved from docker/production/stable/Dockerfile with 100% similarity] blob | blame | history
docker/stable/IMAGE.md [moved from docker/production/stable/IMAGE.md with 100% similarity] blob | blame | history
docker/stable/nginx.conf [moved from docker/production/nginx.conf with 100% similarity] blob | blame | history
docker/stable/supervised.conf [moved from docker/production/stable/supervised.conf with 100% similarity] blob | blame | history
The personal, minimalist, super-fast, database free, bookmarking service - community repo