Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1085 from virtualtam/docker/multi-stage

Browse source 
docker: introduce multi-stage image build (master, latest)
This commit is contained in:
VirtualTam 2018-02-24 13:36:55 +01:00 committed by GitHub
commit ddd3c19f43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
docker/alpine/Dockerfile.latest
View file

@ -1,9 +1,19 @@
# 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 FROM alpine: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 \
curl \
nginx \ nginx \
php7 \ php7 \
php7-ctype \ php7-ctype \
@ -15,7 +25,6 @@ RUN apk --update --no-cache add \
php7-json \ php7-json \
php7-mbstring \ php7-mbstring \
php7-openssl \ php7-openssl \
php7-phar \
php7-session \ php7-session \
php7-xml \ php7-xml \
php7-zlib \ php7-zlib \
@ -25,22 +34,15 @@ COPY nginx.conf /etc/nginx/nginx.conf
COPY php-fpm.conf /etc/php7/php-fpm.conf COPY php-fpm.conf /etc/php7/php-fpm.conf
COPY services.d /etc/services.d COPY services.d /etc/services.d
RUN curl -sS https://getcomposer.org/installer | php7 -- --install-dir=/usr/local/bin --filename=composer \ RUN rm -rf /etc/php7/php-fpm.d/www.conf \
&& 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 \
&& sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php7/php.ini && sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php7/php.ini
WORKDIR /var/www WORKDIR /var/www
RUN curl -L https://github.com/shaarli/Shaarli/archive/latest.tar.gz | tar xzf - \ COPY --from=composer /app/shaarli shaarli
&& mv Shaarli-latest shaarli \
&& cd shaarli \
&& composer --prefer-dist --no-dev install \
&& rm -rf ~/.composer \
&& chown -R nginx:nginx .
VOLUME /var/www/shaarli/data VOLUME /var/www/shaarli/data
EXPOSE 80 EXPOSE 80
ENTRYPOINT ["/bin/s6-svscan", "/etc/services.d"] ENTRYPOINT ["/bin/s6-svscan", "/etc/services.d"]

26
docker/alpine/Dockerfile.master
View file

@ -1,9 +1,19 @@
# Stage 1:
# - Get Shaarli sources
# - Resolve PHP dependencies with Composer
FROM composer:latest as composer
RUN curl -L https://github.com/shaarli/Shaarli/archive/master.tar.gz | tar xzf - \
&& mv Shaarli-master shaarli \
&& cd shaarli \
&& composer --prefer-dist --no-dev install
# Stage 2:
# - Shaarli image
FROM alpine:3.6 FROM alpine: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 \
curl \
nginx \ nginx \
php7 \ php7 \
php7-ctype \ php7-ctype \
@ -15,7 +25,6 @@ RUN apk --update --no-cache add \
php7-json \ php7-json \
php7-mbstring \ php7-mbstring \
php7-openssl \ php7-openssl \
php7-phar \
php7-session \ php7-session \
php7-xml \ php7-xml \
php7-zlib \ php7-zlib \
@ -25,20 +34,15 @@ COPY nginx.conf /etc/nginx/nginx.conf
COPY php-fpm.conf /etc/php7/php-fpm.conf COPY php-fpm.conf /etc/php7/php-fpm.conf
COPY services.d /etc/services.d COPY services.d /etc/services.d
RUN curl -sS https://getcomposer.org/installer | php7 -- --install-dir=/usr/local/bin --filename=composer \ RUN rm -rf /etc/php7/php-fpm.d/www.conf \
&& 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 \
&& sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php7/php.ini && sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php7/php.ini
WORKDIR /var/www WORKDIR /var/www
RUN curl -L https://github.com/shaarli/Shaarli/archive/master.tar.gz | tar xzf - \ COPY --from=composer /app/shaarli shaarli
&& mv Shaarli-master shaarli \
&& cd shaarli \
&& composer --prefer-dist --no-dev install \
&& rm -rf ~/.composer \
&& chown -R nginx:nginx .
RUN chown -R nginx:nginx .
VOLUME /var/www/shaarli/data VOLUME /var/www/shaarli/data
EXPOSE 80 EXPOSE 80