Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
1339 commits 8 branches 1 tag 13 MiB
Commit graph

20 commits

Author SHA1 Message Date
ArthurHoaro
94abe0a653 Docker: build frontend dependencies with node and yarn 2018-03-27 19:05:19 +02:00
Angristan
017baf57d5 Nginx logs to stdout for Docker Alpine images 2018-03-11 21:06:14 +01:00
Jonathan Amiez
ed2de76840 Fix permission issue introduced with multi-stage build 2018-03-02 15:05:48 +01:00
VirtualTam
3c51135f9a docker: introduce multi-stage image build (master, latest) 
Relates to https://github.com/shaarli/Shaarli/issues/755
Relates to https://github.com/shaarli/Shaarli/pull/1072

See:
- https://docs.docker.com/develop/develop-images/multistage-build/
- https://hub.docker.com/r/library/composer/
- https://github.com/composer/docker
- https://github.com/docker-library/docs/tree/master/composer

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2018-02-14 23:13:05 +01:00
Immánuel!
b6b53143fc Feature: Docker armhf support (#1041) 
Docker: add Alpine Linux ARM HF latest and master images

See:
- http://www.armhf.com/
- https://wiki.alpinelinux.org/wiki/Alpine_on_ARM
- https://hub.docker.com/r/lsiobase/alpine.armhf/
 2018-01-04 12:38:38 +01:00
VirtualTam
fab0f4e576 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>
 2017-10-21 18:44:19 +02:00
VirtualTam
e3a3cc0da8 docker: rename resources for the stable image 
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2017-10-03 20:07:46 +02:00
VirtualTam
1a216faecb 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>
 2017-10-03 19:47:01 +02:00
VirtualTam
d691604080 docker: add alpine,debian,ubuntu test images 
Relates to https://github.com/shaarli/Shaarli/issues/843

Added:
- Makefile target to run commands in a Docker test context
- Docker images to run Shaarli test suites:
  - Alpine 3.6
  - Debian 8
  - Debian 9
  - Ubuntu 16.04
- Documentation

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2017-09-18 21:13:59 +02:00
VirtualTam
84d0632a2d 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>
 2017-07-29 15:32:22 +02:00
VirtualTam
69173356cd API+Docker: enable nginx URL rewriting 
Closes https://github.com/shaarli/Shaarli/issues/668

Changed:
- let nginx rewrite API URLs

See:
- https://www.slimframework.com/docs/start/web-servers.html
- https://nginx.org/en/docs/http/ngx_http_fastcgi_module.html#fastcgi_split_path_info

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2017-01-05 13:24:00 +01:00
Arthur
e2e6ec0f4d Merge pull request #680 from ArthurHoaro/apache-htaccess 
.htaccess files: support Apache 2.4+ syntax
 2016-11-08 15:32:14 +01:00
ArthurHoaro
5ebc1d504b .htaccess files: support Apache 2.4+ syntax 
If `mod_version` is enabled, the previous syntax will apply for Apache <2.4.
If not, the new syntax is used by default.

Fixes #676

`mod_version` identifier is `version_module` across all Apache versions. See:

  * https://httpd.apache.org/docs/current/mod/mod_version.html
  * https://httpd.apache.org/docs/2.2/mod/mod_version.html
  * https://serverfault.com/questions/733910/how-do-i-load-mod-version-only-if-it-isnt-built-in-to-apache

Note that version_module comes built-in with Debian (and derivatives) Apache2 packages, see https://wiki.debian.org/Apache/PackagingFor24
 2016-11-08 11:38:14 +01:00
VirtualTam
68579ad5c4 Docker: increase maximum file upload size to 10 MiB 
Relates to https://github.com/shaarli/Shaarli/issues/681

Changed:
- nginx+php-fpm: set maximum upload size to 10 MiB

See:
- https://nginx.org/en/docs/http/ngx_http_core_module.html#client_max_body_size
- https://secure.php.net/manual/en/ini.core.php#ini.post-max-size
- https://secure.php.net/manual/en/ini.core.php#ini.upload-max-filesize

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2016-11-06 00:43:50 +01:00
VirtualTam
b7f8b874bb Docker: set favicon location in nginx configuration 
Relates to https://github.com/shaarli/Shaarli/issues/681

Fixed:
- nginx: set the favicon location

See http://serverfault.com/a/352861

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2016-11-05 19:57:36 +01:00
Gary Marigliano
7329118e9c Add a missing backslash in stable Dockerfile version 2016-09-14 11:08:11 +02:00
VirtualTam
bb953a0106 Merge pull request #638 from virtualtam/docker/stable/composer 
Docker: update dependencies, introduce Composer (stable branch)
 2016-08-14 17:11:24 +02:00
VirtualTam
665279ec99 Docker: update dependencies, introduce Composer 
Relates to https://github.com/shaarli/Shaarli/issues/607
Relates to https://github.com/shaarli/Shaarli/pull/612
Relates to https://github.com/shaarli/Shaarli/pull/624
Relates to https://github.com/shaarli/Shaarli/pull/633

See https://github.com/shaarli/Shaarli/wiki/Server-requirements

Modifications:
- [prod][stable] refactor Dockerfile
- [prod][stable] set $TERM=dumb to avoid debconf-related issues
- [prod][stable] install ca-certificates
- [prod][stable] cleanup APT cache after installing packages
- [prod][stable] use Composer to resolve PHP dependencies

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2016-08-14 16:23:57 +02:00
VirtualTam
90f12b12ca Docker: update dependencies, introduce Composer 
Relates to https://github.com/shaarli/Shaarli/issues/607
Relates to https://github.com/shaarli/Shaarli/pull/612
Relates to https://github.com/shaarli/Shaarli/pull/624

See https://github.com/shaarli/Shaarli/wiki/Server-requirements

Modifications:
- [all][env] set $TERM=dumb to avoid debconf-related issues
- [all][pkg] install ca-certificates
- [all][pkg] cleanup APT cache after installing packages
- [dev] refactor Dockerfile
- [prod][master] refactor Dockerfile
- [prod][master][php] use Composer to resolve PHP dependencies

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2016-08-14 16:21:30 +02:00
VirtualTam
453f4653c3 Docker: move Dockerfiles to the main repository 
Relates to #420

Fixes:
- [all] remove Nginx' 'server_name' attribute
- [dev] create the phpinfo() script from the Dockerfile

Modifications:
- [all] remove documentation/guide (to be added to the wiki)
- [all] update maintainer information
- [prod] differentiate 'master' (:latest) and 'stable' (:stable) images

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2016-01-02 19:01:33 +01:00