diff options
author | VirtualTam <virtualtam@flibidi.net> | 2017-07-29 15:26:27 +0200 |
---|---|---|
committer | VirtualTam <virtualtam@flibidi.net> | 2017-07-29 15:32:22 +0200 |
commit | 84d0632a2df1cf833610bc8dd45d4808e4a8dc0e (patch) | |
tree | c550f8a21c8f243d305125f41e7d4c59646f257b /docker | |
parent | 57ee53d6c6be4b641764b0a635b2998c6cdc8197 (diff) | |
download | Shaarli-84d0632a2df1cf833610bc8dd45d4808e4a8dc0e.tar.gz Shaarli-84d0632a2df1cf833610bc8dd45d4808e4a8dc0e.tar.zst Shaarli-84d0632a2df1cf833610bc8dd45d4808e4a8dc0e.zip |
docker: remove `dev` image, update documentation
Relates to https://github.com/shaarli/Shaarli/issues/843
Changed:
- Update Docker image list
- Update Docker documentation structure
Removed:
- Delete Dockerfile and resources for the `dev` image
- Cleanup `doc/` resources
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
Diffstat (limited to 'docker')
-rw-r--r-- | docker/development/Dockerfile | 38 | ||||
-rw-r--r-- | docker/development/IMAGE.md | 10 | ||||
-rw-r--r-- | docker/development/nginx.conf | 80 | ||||
-rw-r--r-- | docker/development/supervised.conf | 13 |
4 files changed, 0 insertions, 141 deletions
diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile deleted file mode 100644 index d9ef8da7..00000000 --- a/docker/development/Dockerfile +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | FROM debian:jessie | ||
2 | MAINTAINER Shaarli Community | ||
3 | |||
4 | ENV TERM dumb | ||
5 | RUN apt-get update \ | ||
6 | && apt-get install --no-install-recommends -y \ | ||
7 | ca-certificates \ | ||
8 | nginx-light \ | ||
9 | php5-curl \ | ||
10 | php5-fpm \ | ||
11 | php5-gd \ | ||
12 | php5-intl \ | ||
13 | supervisor \ | ||
14 | git \ | ||
15 | nano \ | ||
16 | && apt-get clean | ||
17 | |||
18 | RUN sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php5/fpm/php.ini | ||
19 | RUN sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php5/fpm/php.ini | ||
20 | COPY nginx.conf /etc/nginx/nginx.conf | ||
21 | COPY supervised.conf /etc/supervisor/conf.d/supervised.conf | ||
22 | |||
23 | ADD https://getcomposer.org/composer.phar /usr/local/bin/composer | ||
24 | RUN chmod 755 /usr/local/bin/composer | ||
25 | |||
26 | WORKDIR /var/www | ||
27 | RUN git clone https://github.com/shaarli/Shaarli.git shaarli \ | ||
28 | && cd shaarli \ | ||
29 | && composer --prefer-dist install | ||
30 | RUN rm -rf html \ | ||
31 | && echo "<?php phpinfo(); ?>" > index.php \ | ||
32 | && chown -R www-data:www-data . | ||
33 | |||
34 | VOLUME /var/www/shaarli/data | ||
35 | |||
36 | EXPOSE 80 | ||
37 | |||
38 | CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/supervisord.conf"] | ||
diff --git a/docker/development/IMAGE.md b/docker/development/IMAGE.md deleted file mode 100644 index e2ff0f0e..00000000 --- a/docker/development/IMAGE.md +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | ## shaarli:dev | ||
2 | - [Debian 8 Jessie](https://hub.docker.com/_/debian/) | ||
3 | - [PHP5-FPM](http://php-fpm.org/) | ||
4 | - [Nginx](http://nginx.org/) | ||
5 | - [Shaarli](https://github.com/shaarli/Shaarli) | ||
6 | |||
7 | ### Development tools | ||
8 | - [composer](https://getcomposer.org/) | ||
9 | - [git](http://git-scm.com/) | ||
10 | - [nano](http://www.nano-editor.org/) | ||
diff --git a/docker/development/nginx.conf b/docker/development/nginx.conf deleted file mode 100644 index 79c45bfe..00000000 --- a/docker/development/nginx.conf +++ /dev/null | |||
@@ -1,80 +0,0 @@ | |||
1 | user www-data www-data; | ||
2 | daemon off; | ||
3 | worker_processes 4; | ||
4 | |||
5 | events { | ||
6 | worker_connections 768; | ||
7 | } | ||
8 | |||
9 | http { | ||
10 | include mime.types; | ||
11 | default_type application/octet-stream; | ||
12 | keepalive_timeout 20; | ||
13 | |||
14 | client_max_body_size 10m; | ||
15 | |||
16 | index index.html index.php; | ||
17 | |||
18 | server { | ||
19 | listen 80; | ||
20 | root /var/www/shaarli; | ||
21 | |||
22 | access_log /var/log/nginx/shaarli.access.log; | ||
23 | error_log /var/log/nginx/shaarli.error.log; | ||
24 | |||
25 | location /phpinfo/ { | ||
26 | # add a PHP info page for convenience | ||
27 | fastcgi_pass unix:/var/run/php5-fpm.sock; | ||
28 | fastcgi_index index.php; | ||
29 | fastcgi_param SCRIPT_FILENAME /var/www/index.php; | ||
30 | include fastcgi_params; | ||
31 | } | ||
32 | |||
33 | location ~ /\. { | ||
34 | # deny access to dotfiles | ||
35 | access_log off; | ||
36 | log_not_found off; | ||
37 | deny all; | ||
38 | } | ||
39 | |||
40 | location ~ ~$ { | ||
41 | # deny access to temp editor files, e.g. "script.php~" | ||
42 | access_log off; | ||
43 | log_not_found off; | ||
44 | deny all; | ||
45 | } | ||
46 | |||
47 | location ~* \.(?:ico|css|js|gif|jpe?g|png)$ { | ||
48 | # cache static assets | ||
49 | expires max; | ||
50 | add_header Pragma public; | ||
51 | add_header Cache-Control "public, must-revalidate, proxy-revalidate"; | ||
52 | } | ||
53 | |||
54 | location = /favicon.ico { | ||
55 | # serve the Shaarli favicon from its custom location | ||
56 | alias /var/www/shaarli/images/favicon.ico; | ||
57 | } | ||
58 | |||
59 | location / { | ||
60 | # Slim - rewrite URLs | ||
61 | try_files $uri /index.php$is_args$args; | ||
62 | } | ||
63 | |||
64 | location ~ (index)\.php$ { | ||
65 | # Slim - split URL path into (script_filename, path_info) | ||
66 | try_files $uri =404; | ||
67 | fastcgi_split_path_info ^(.+\.php)(/.+)$; | ||
68 | |||
69 | # filter and proxy PHP requests to PHP-FPM | ||
70 | fastcgi_pass unix:/var/run/php5-fpm.sock; | ||
71 | fastcgi_index index.php; | ||
72 | include fastcgi.conf; | ||
73 | } | ||
74 | |||
75 | location ~ \.php$ { | ||
76 | # deny access to all other PHP scripts | ||
77 | deny all; | ||
78 | } | ||
79 | } | ||
80 | } | ||
diff --git a/docker/development/supervised.conf b/docker/development/supervised.conf deleted file mode 100644 index 5acd9795..00000000 --- a/docker/development/supervised.conf +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | [program:php5-fpm] | ||
2 | command=/usr/sbin/php5-fpm -F | ||
3 | priority=5 | ||
4 | autostart=true | ||
5 | autorestart=true | ||
6 | |||
7 | [program:nginx] | ||
8 | command=/usr/sbin/nginx | ||
9 | priority=10 | ||
10 | autostart=true | ||
11 | autorestart=true | ||
12 | stdout_events_enabled=true | ||
13 | stderr_events_enabled=true | ||