diff options
author | VirtualTam <virtualtam@flibidi.net> | 2017-10-21 18:15:52 +0200 |
---|---|---|
committer | VirtualTam <virtualtam@flibidi.net> | 2017-10-21 18:44:19 +0200 |
commit | fab0f4e5766d519a37b497927812c6b5b38e51ed (patch) | |
tree | 805c8e0624db6b5154d2cd4e4464816c22a4512a /docker | |
parent | 72cfe44436f4316112fc4aabfe8940aa7b4adcab (diff) | |
download | Shaarli-fab0f4e5766d519a37b497927812c6b5b38e51ed.tar.gz Shaarli-fab0f4e5766d519a37b497927812c6b5b38e51ed.tar.zst Shaarli-fab0f4e5766d519a37b497927812c6b5b38e51ed.zip |
docker: add 'latest' image
This implies the following changes:
- `shaarli/shaarli:latest` will now point to the `latest` release
- `shaarli/shaarli:master` will point to the `master` branch
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
Diffstat (limited to 'docker')
-rw-r--r-- | docker/alpine/Dockerfile.latest | 47 | ||||
-rw-r--r-- | docker/alpine/IMAGE.md | 13 |
2 files changed, 56 insertions, 4 deletions
diff --git a/docker/alpine/Dockerfile.latest b/docker/alpine/Dockerfile.latest new file mode 100644 index 00000000..dd4a173c --- /dev/null +++ b/docker/alpine/Dockerfile.latest | |||
@@ -0,0 +1,47 @@ | |||
1 | FROM alpine:3.6 | ||
2 | MAINTAINER Shaarli Community | ||
3 | |||
4 | RUN apk --update --no-cache add \ | ||
5 | ca-certificates \ | ||
6 | curl \ | ||
7 | nginx \ | ||
8 | php7 \ | ||
9 | php7-ctype \ | ||
10 | php7-curl \ | ||
11 | php7-fpm \ | ||
12 | php7-gd \ | ||
13 | php7-iconv \ | ||
14 | php7-intl \ | ||
15 | php7-json \ | ||
16 | php7-mbstring \ | ||
17 | php7-openssl \ | ||
18 | php7-phar \ | ||
19 | php7-session \ | ||
20 | php7-xml \ | ||
21 | php7-zlib \ | ||
22 | s6 | ||
23 | |||
24 | COPY nginx.conf /etc/nginx/nginx.conf | ||
25 | COPY php-fpm.conf /etc/php7/php-fpm.conf | ||
26 | COPY services.d /etc/services.d | ||
27 | |||
28 | RUN curl -sS https://getcomposer.org/installer | php7 -- --install-dir=/usr/local/bin --filename=composer \ | ||
29 | && rm -rf /etc/php7/php-fpm.d/www.conf \ | ||
30 | && sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php7/php.ini \ | ||
31 | && sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php7/php.ini | ||
32 | |||
33 | |||
34 | WORKDIR /var/www | ||
35 | RUN curl -L https://github.com/shaarli/Shaarli/archive/latest.tar.gz | tar xzf - \ | ||
36 | && mv Shaarli-latest shaarli \ | ||
37 | && cd shaarli \ | ||
38 | && composer --prefer-dist --no-dev install \ | ||
39 | && rm -rf ~/.composer \ | ||
40 | && chown -R nginx:nginx . | ||
41 | |||
42 | VOLUME /var/www/shaarli/data | ||
43 | |||
44 | EXPOSE 80 | ||
45 | |||
46 | ENTRYPOINT ["/bin/s6-svscan", "/etc/services.d"] | ||
47 | CMD [] | ||
diff --git a/docker/alpine/IMAGE.md b/docker/alpine/IMAGE.md index 6f827b35..a8952257 100644 --- a/docker/alpine/IMAGE.md +++ b/docker/alpine/IMAGE.md | |||
@@ -1,5 +1,10 @@ | |||
1 | ## shaarli:latest | 1 | ## Alpine images |
2 | - [Debian 8 Jessie](https://hub.docker.com/_/debian/) | 2 | - [Alpine Linux](https://www.alpinelinux.org/) |
3 | - [PHP5-FPM](http://php-fpm.org/) | 3 | - [PHP-FPM](http://php-fpm.org/) |
4 | - [Nginx](http://nginx.org/) | 4 | - [Nginx](http://nginx.org/) |
5 | - [Shaarli](https://github.com/shaarli/Shaarli) | 5 | |
6 | ### `shaarli/shaarli:latest` | ||
7 | - [Shaarli](https://github.com/shaarli/Shaarli), `latest` branch | ||
8 | |||
9 | ### `shaarli/shaarli:master` | ||
10 | - [Shaarli](https://github.com/shaarli/Shaarli), `master` branch | ||