sparklyballs 7 роки тому
батько
коміт
74a1318c91
2 змінених файлів з 10 додано та 10 видалено
  1. 9 10
      Dockerfile
  2. 1 0
      README.md

+ 9 - 10
Dockerfile

@@ -1,25 +1,24 @@
-FROM lsiobase/alpine.nginx:3.6
-MAINTAINER sparklyballs
+FROM lsiobase/alpine.nginx:3.7
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="sparklyballs"
 
-# install packages
 RUN \
+ echo "**** install packages ****" && \
  apk add --no-cache \
 	ffmpeg \
 	imagemagick \
 	php7-gd \
 	php7-imagick && \
-
-# configure php
-echo "[www]" >> /etc/php7/php-fpm.conf && \
-echo "php_admin_value[upload_max_filesize] = 10M" >> /etc/php7/php-fpm.conf && \
-echo "php_admin_value[post_max_size] = 10M" >> /etc/php7/php-fpm.conf && \
-echo "php_admin_value[memory_limit] = 64M" >> /etc/php7/php-fpm.conf && \
-echo "php_admin_value[max_execution_time] = 15" >> /etc/php7/php-fpm.conf
+ echo "**** configure php ****" && \
+ echo "[www]" >> /etc/php7/php-fpm.conf && \
+ echo "php_admin_value[upload_max_filesize] = 10M" >> /etc/php7/php-fpm.conf && \
+ echo "php_admin_value[post_max_size] = 10M" >> /etc/php7/php-fpm.conf && \
+ echo "php_admin_value[memory_limit] = 64M" >> /etc/php7/php-fpm.conf && \
+ echo "php_admin_value[max_execution_time] = 15" >> /etc/php7/php-fpm.conf
 
 # add local files
 COPY root/ /

+ 1 - 0
README.md

@@ -82,6 +82,7 @@ On first run create an admin account, any folder and its subfolders that you map
 
 ## Versions
 
++ **07.01.18:** Rebase to alpine 3.7.
 + **25.05.17:** Rebase to alpine 3.6.
 + **03.05.17:** Use repo pinning to better solve dependencies, use repo version of php7-imagick.
 + **14.02.17:** Rebase to alpine 3.5.