Merge pull request #5 from linuxserver/alpine_3.5

Alpine 3.5

Author: j0nnymoe

Dockerfile

@@ -1,48 +1,67 @@
-FROM linuxserver/baseimage.apache
+FROM lsiobase/alpine.nginx:3.5
 MAINTAINER sparklyballs
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 
-# copy sources.list
-COPY sources.list /etc/apt/
+# install build packages
+RUN \
+ apk add --no-cache --virtual=build-dependencies \
+	autoconf \
+	curl \
+	file \
+	g++ \
+	gcc \
+	imagemagick-dev \
+	libtool \
+	make \
+	php7-dev && \
 
-# set install packages as variable
-ENV APTLIST="curl \
-lynx-cur \
-php5-cgi \
-php5-gd \
-php5-imagick \
-php5-mysql \
-php5-xmlrpc \
-php5-xsl \
-php5-apcu \
-php-auth \
-php-auth-sasl \
-php-net-smtp \
-php-pear \
-unzip \
-wget"
+# install runtime packages
+ apk add --no-cache \
+	curl \
+	imagemagick \
+	lynx \
+	php7-apcu \
+	php7-cgi \
+	php7-gd \
+	php7-mysqlnd \
+	php7-pear \
+	php7-xmlrpc \
+	php7-xsl \
+	re2c \
+	unzip \
+	wget && \
 
+# install php imagemagick
+ mkdir -p \
+	/tmp/imagick-src && \
+ curl -o \
+ /tmp/imagick.tgz -L \
+	https://pecl.php.net/get/imagick && \
+ tar xf \
+ /tmp/imagick.tgz -C \
+	/tmp/imagick-src --strip-components=1 && \
+ cd /tmp/imagick-src && \
+ phpize7 && \
+ ./configure \
+	--prefix=/usr \
+	--with-php-config=/usr/bin/php-config7 && \
+ make && \
+ make install && \
+ echo "extension=imagick.so" > /etc/php7/conf.d/00_imagick.ini && \
 
+# cleanup
+ apk del --purge \
+	build-dependencies && \
+ rm -rf \
+	/tmp/*
 
-# install packages
-RUN apt-get update && \
-apt-get install $APTLIST -qy && \
+# copy local files
+COPY root/ /
 
-# cleanup 
-apt-get clean -y && \
-rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-# add some files 
-ADD defaults/ /defaults/
-ADD init/ /etc/my_init.d/
-RUN chmod -v +x /etc/service/*/run /etc/my_init.d/*.sh
-
-# expose ports
+# ports and volumes
 EXPOSE 80 443
-
-# set volumes
 VOLUME /config /pictures

README.md

@@ -63,7 +63,7 @@ In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as bel
 
 You must create a user and database for piwigo to use in a mysql/mariadb server. In the setup page for database, use the ip address rather than hostname....
 
-A basic apache configuration file can be found in /config/apache/site-confs , edit the file to enable ssl (port 443 by default), set servername etc.. 
+A basic nginx configuration file can be found in /config/nginx/site-confs , edit the file to enable ssl (port 443 by default), set servername etc.. 
 Self-signed keys are generated the first time you run the container and can be found in /config/keys , if needed, you can replace them with your own.
 
 The easiest way to edit the configuration file is to enable local files editor from the plugins page and use it to configure email settings etc....
@@ -84,6 +84,7 @@ The easiest way to edit the configuration file is to enable local files editor f
 
 ## Versions
 
++ **23.02.17:** Rebase to alpine linux 3.5 and nginx.
 + **14.10.16:** Add version layer information.
 + **10.09.16:** Add layer badges to README.
 + **29.08.15:** Initial Release.

defaults/default.conf

@@ -0,0 +1,30 @@
+server {
+	listen 80 default_server;
+
+	listen 443 ssl;
+
+	root /config/www/gallery;
+	index index.html index.htm index.php;
+
+	server_name _;
+
+	ssl_certificate /config/keys/cert.crt;
+	ssl_certificate_key /config/keys/cert.key;
+
+	client_max_body_size 0;
+
+	location / {
+		try_files $uri $uri/ /index.html /index.php?$args =404;
+	}
+
+	location ~ \.php$ {
+		fastcgi_split_path_info ^(.+\.php)(/.+)$;
+		# With php5-cgi alone:
+		fastcgi_pass 127.0.0.1:9000;
+		# With php5-fpm:
+		#fastcgi_pass unix:/var/run/php5-fpm.sock;
+		fastcgi_index index.php;
+		include /etc/nginx/fastcgi_params;
+
+	}
+}

init/60_set_the_site.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/with-contenv bash
+
+# make our folders
+mkdir -p \
+	/config/www/gallery
+
+# install piwigo
+if [ ! -f "/config/www/gallery/index.php" ]; then
+	curl -o /tmp/piwigo.zip -L "http://piwigo.org/download/dlcounter.php?code=latest"
+	unzip -q /tmp/piwigo.zip  -d /tmp
+	mv /tmp/piwigo/* /config/www/gallery
+	rm -rf /tmp/piwigo /tmp/piwigo.zip
+fi
+
+# copy config
+[[ ! -f "/config/www/gallery/local/config/config.inc.php" ]] && \
+	cp /config/www/gallery/include/config_default.inc.php \
+	/config/www/gallery/local/config/config.inc.php
+
+# permissions
+chown -R abc:abc \
+	/config
+