docker: build the images from the local sources

Relates to https://github.com/shaarli/Shaarli/issues/1153

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
This commit is contained in:
VirtualTam 2018-06-17 01:02:50 +02:00
parent 7cf436cea4
commit 2a3fe990dd
13 changed files with 76 additions and 129 deletions

51
.dockerignore Normal file
View file

@ -0,0 +1,51 @@
# Docker-ignore
.dev
.git
.github
tests
# Shaarli runtime resources
cache/*
data/*
pagecache/*
tmp/*
# Eclipse project files
.settings
.buildpath
.project
# Raintpl generated pages
*.rtpl.php
# 3rd-party dependencies
vendor/
# Release archives
*.tar.gz
*.zip
inc/languages/*/LC_MESSAGES/shaarli.mo
# Development and test resources
coverage
doxygen
sandbox
phpmd.html
# User plugin configuration
plugins/*/config.php
# 3rd party themes
tpl/*
!tpl/default
!tpl/vintage
# Front end
node_modules
tpl/default/js
tpl/default/css
tpl/default/fonts
tpl/default/img
tpl/vintage/js
tpl/vintage/css
tpl/vintage/img

4
.gitattributes vendored
View file

@ -33,7 +33,9 @@ Dockerfile text
.travis.yml export-ignore .travis.yml export-ignore
doc/**/*.json export-ignore doc/**/*.json export-ignore
doc/**/*.md export-ignore doc/**/*.md export-ignore
docker/ export-ignore .docker/ export-ignore
.dockerignore export-ignore
Dockerfile* export-ignore
Doxyfile export-ignore Doxyfile export-ignore
Makefile export-ignore Makefile export-ignore
node_modules/ export-ignore node_modules/ export-ignore

View file

@ -1,13 +1,20 @@
# Stage 1: # Stage 1:
# - Get Shaarli sources # - Copy Shaarli sources
# - Resolve PHP dependencies with Composer # - Build documentation
FROM composer:latest as composer FROM python:3-alpine as docs
RUN curl -L https://github.com/shaarli/Shaarli/archive/master.tar.gz | tar xzf - \ ADD . /usr/src/app/shaarli
&& mv Shaarli-master shaarli \ RUN cd /usr/src/app/shaarli \
&& cd shaarli \ && pip install --no-cache-dir mkdocs \
&& composer --prefer-dist --no-dev install && mkdocs build
# Stage 2: # Stage 2:
# - Resolve PHP dependencies with Composer
FROM composer:latest as composer
COPY --from=docs /usr/src/app/shaarli /app/shaarli
RUN cd shaarli \
&& composer --prefer-dist --no-dev install
# Stage 3:
# - Frontend dependencies # - Frontend dependencies
FROM node:9.9-alpine as node FROM node:9.9-alpine as node
COPY --from=composer /app/shaarli shaarli COPY --from=composer /app/shaarli shaarli
@ -16,7 +23,7 @@ RUN cd shaarli \
&& yarn run build \ && yarn run build \
&& rm -rf node_modules && rm -rf node_modules
# Stage 3: # Stage 4:
# - Shaarli image # - Shaarli image
FROM alpine:3.6 FROM alpine:3.6
LABEL maintainer="Shaarli Community" LABEL maintainer="Shaarli Community"
@ -39,9 +46,9 @@ RUN apk --update --no-cache add \
php7-zlib \ php7-zlib \
s6 s6
COPY nginx.conf /etc/nginx/nginx.conf COPY .docker/nginx.conf /etc/nginx/nginx.conf
COPY php-fpm.conf /etc/php7/php-fpm.conf COPY .docker/php-fpm.conf /etc/php7/php-fpm.conf
COPY services.d /etc/services.d COPY .docker/services.d /etc/services.d
RUN rm -rf /etc/php7/php-fpm.d/www.conf \ RUN rm -rf /etc/php7/php-fpm.d/www.conf \
&& sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php7/php.ini \ && sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php7/php.ini \

View file

@ -1,5 +1,5 @@
FROM lsiobase/alpine.armhf:3.6 FROM lsiobase/alpine.armhf:3.6
MAINTAINER Shaarli Community LABEL maintainer="Shaarli Community"
RUN apk --update --no-cache add \ RUN apk --update --no-cache add \
ca-certificates \ ca-certificates \
@ -21,9 +21,9 @@ RUN apk --update --no-cache add \
php7-zlib \ php7-zlib \
s6 s6
COPY nginx.conf /etc/nginx/nginx.conf COPY .docker/nginx.conf /etc/nginx/nginx.conf
COPY php-fpm.conf /etc/php7/php-fpm.conf COPY .docker/php-fpm.conf /etc/php7/php-fpm.conf
COPY services.d /etc/services.d COPY .docker/services.d /etc/services.d
RUN curl -sS https://getcomposer.org/installer | php7 -- --install-dir=/usr/local/bin --filename=composer \ RUN curl -sS https://getcomposer.org/installer | php7 -- --install-dir=/usr/local/bin --filename=composer \
&& rm -rf /etc/php7/php-fpm.d/www.conf \ && rm -rf /etc/php7/php-fpm.d/www.conf \

View file

@ -1,49 +0,0 @@
FROM lsiobase/alpine.armhf:3.6
MAINTAINER Shaarli Community
RUN apk --update --no-cache add \
ca-certificates \
curl \
nginx \
php7 \
php7-ctype \
php7-curl \
php7-fpm \
php7-gd \
php7-iconv \
php7-intl \
php7-json \
php7-mbstring \
php7-openssl \
php7-phar \
php7-session \
php7-xml \
php7-zlib \
s6
COPY nginx.conf /etc/nginx/nginx.conf
COPY php-fpm.conf /etc/php7/php-fpm.conf
COPY services.d /etc/services.d
RUN curl -sS https://getcomposer.org/installer | php7 -- --install-dir=/usr/local/bin --filename=composer \
&& rm -rf /etc/php7/php-fpm.d/www.conf \
&& sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php7/php.ini \
&& sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php7/php.ini
WORKDIR /var/www
RUN curl -L https://github.com/shaarli/Shaarli/archive/latest.tar.gz | tar xzf - \
&& mv Shaarli-latest shaarli \
&& cd shaarli \
&& composer --prefer-dist --no-dev install \
&& rm -rf ~/.composer \
&& chown -R nginx:nginx . \
&& ln -sf /dev/stdout /var/log/nginx/shaarli.access.log \
&& ln -sf /dev/stderr /var/log/nginx/shaarli.error.log
VOLUME /var/www/shaarli/data
EXPOSE 80
ENTRYPOINT ["/bin/s6-svscan", "/etc/services.d"]
CMD []

View file

@ -1,54 +0,0 @@
# Stage 1:
# - Get Shaarli sources
# - Resolve PHP dependencies with Composer
FROM composer:latest as composer
RUN curl -L https://github.com/shaarli/Shaarli/archive/latest.tar.gz | tar xzf - \
&& mv Shaarli-latest shaarli \
&& cd shaarli \
&& composer --prefer-dist --no-dev install
# Stage 2:
# - Shaarli image
FROM alpine:3.6
LABEL maintainer="Shaarli Community"
RUN apk --update --no-cache add \
ca-certificates \
nginx \
php7 \
php7-ctype \
php7-curl \
php7-fpm \
php7-gd \
php7-iconv \
php7-intl \
php7-json \
php7-mbstring \
php7-openssl \
php7-session \
php7-xml \
php7-zlib \
s6
COPY nginx.conf /etc/nginx/nginx.conf
COPY php-fpm.conf /etc/php7/php-fpm.conf
COPY services.d /etc/services.d
RUN rm -rf /etc/php7/php-fpm.d/www.conf \
&& sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php7/php.ini \
&& sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php7/php.ini
WORKDIR /var/www
COPY --from=composer /app/shaarli shaarli
RUN chown -R nginx:nginx . \
&& ln -sf /dev/stdout /var/log/nginx/shaarli.access.log \
&& ln -sf /dev/stderr /var/log/nginx/shaarli.error.log
VOLUME /var/www/shaarli/data
EXPOSE 80
ENTRYPOINT ["/bin/s6-svscan", "/etc/services.d"]
CMD []

View file

@ -1,10 +0,0 @@
## Alpine images
- [Alpine Linux](https://www.alpinelinux.org/)
- [PHP-FPM](http://php-fpm.org/)
- [Nginx](http://nginx.org/)
### `shaarli/shaarli:latest`
- [Shaarli](https://github.com/shaarli/Shaarli), `latest` branch
### `shaarli/shaarli:master`
- [Shaarli](https://github.com/shaarli/Shaarli), `master` branch