rebase to 3.5

Dockerfile

@@ -1,4 +1,4 @@
-FROM lsiobase/alpine.nginx
+FROM lsiobase/alpine.nginx:3.5
 MAINTAINER Sparklyballs
 
 # set version label
@@ -9,15 +9,16 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 # install packages
 RUN \
  apk add --no-cache \
+	imagemagick \
 	ffmpeg \
-	php5-gd && \
+	php7-gd && \
 
 # configure php
-echo "[www]" >> /defaults/nginx-fpm.conf && \
-echo "php_admin_value[upload_max_filesize] = 10M" >> /defaults/nginx-fpm.conf && \
-echo "php_admin_value[post_max_size] = 10M" >> /defaults/nginx-fpm.conf && \
-echo "php_admin_value[memory_limit] = 64M" >> /defaults/nginx-fpm.conf && \
-echo "php_admin_value[max_execution_time] = 15" >> /defaults/nginx-fpm.conf
+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/ /

README.md

@@ -82,6 +82,7 @@ On first run create an admin account, any folder and its subfolders that you map
 
 ## Versions
 
++ **14.02.17:** Rebase to alpine 3.5.
 + **14.10.16:** Add version layer information.
 + **30.09.16:** Rebase to alpine linux. 
 + **11.09.16:** Add layer badges to README. 

root/etc/cont-init.d/40-install

@@ -3,12 +3,15 @@
 # fix for linting
 declare config
 
+# install photoshow
+echo "fetching photoshow files from github"
+git clone https://github.com/thibaud-rohmer/PhotoShow.git /config/www/PhotoShow
+
+# set config
 THUMBS="/Thumbs"
 PICTURES="/Pictures"
 
 if [ ! -f "/config/www/PhotoShow/config.php" ]; then
-echo "fetching photoshow files from github"
-git clone https://github.com/thibaud-rohmer/PhotoShow.git /config/www/PhotoShow
 sed -i -e "s#$config->photos_dir.\+#$config->photos_dir = \"${PICTURES}\";#" /config/www/PhotoShow/config.php
 sed -i -e "s#$config->ps_generated.\+#$config->ps_generated = \"${THUMBS}\";#" /config/www/PhotoShow/config.php
 fi
@@ -16,4 +19,10 @@ fi
 # patch in fixed keyboard.js file
 cp /defaults/keyboard.js /config/www/PhotoShow/src/js/keyboard.js
 sed -i -e "s@\$config->timezone.*@\$config->timezone = \"${TZ}\"@g" /config/www/PhotoShow/config.php
-chown -R abc:abc /config/www/PhotoShow /Thumbs
+
+# permissions
+chown -R abc:abc \
+	/config/www/PhotoShow \
+	/Thumbs
+
+

test

@@ -0,0 +1 @@
+$config->imagemagick_path = '/usr/bin/convert' ;