github-mirrors/piwigo
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-piwigo.git synced 2025-04-24 13:17:05 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #49 from linuxserver/standard-base

Browse source 
Standard base
This commit is contained in:
Eric Nemchik 2022-11-08 09:51:02 -06:00 • committed by GitHub
commit 66a668915c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 114 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Dockerfile
View file

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.15
# set version label
ARG BUILD_DATE
@ -17,25 +17,27 @@ RUN \
libjpeg-turbo-utils \
lynx \
mediainfo \
php7-apcu \
php7-cgi \
php7-ctype \
php7-curl \
php7-dom \
php7-exif \
php7-gd \
php7-imagick \
php7-ldap \
php7-mysqli \
php7-mysqlnd \
php7-pear \
php7-xmlrpc \
php7-xsl \
php7-zip \
php8-apcu \
php8-cgi \
php8-ctype \
php8-curl \
php8-dom \
php8-exif \
php8-gd \
php8-ldap \
php8-mysqli \
php8-mysqlnd \
php8-pear \
php8-pecl-imagick \
php8-xsl \
php8-zip \
poppler-utils \
re2c \
unzip \
wget && \
apk add --no-cache \
--repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
php8-pecl-xmlrpc && \
echo "**** download piwigo ****" && \
if [ -z ${PIWIGO_RELEASE+x} ]; then \
PIWIGO_RELEASE=$(curl -sX GET "https://api.github.com/repos/Piwigo/Piwigo/releases/latest" \
@ -46,13 +48,13 @@ RUN \
/piwigo/piwigo.zip -L \
"https://piwigo.org/download/dlcounter.php?code=${PIWIGO_RELEASE}" && \
# The max filesize is 2M by default, which is way to small for most photos
sed -ri 's/^upload_max_filesize = .*/upload_max_filesize = 100M/' /etc/php7/php.ini && \
sed -ri 's/^upload_max_filesize = .*/upload_max_filesize = 100M/' /etc/php8/php.ini && \
# The max post size is 8M by default, it must be at least max_filesize
sed -ri 's/^post_max_size = .*/post_max_size = 100M/' /etc/php7/php.ini
sed -ri 's/^post_max_size = .*/post_max_size = 100M/' /etc/php8/php.ini
# copy local files
COPY root/ /
# ports and volumes
EXPOSE 80 443
VOLUME /config /gallery
VOLUME /config

40
Dockerfile.aarch64
View file

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.15
# set version label
ARG BUILD_DATE
@ -17,25 +17,27 @@ RUN \
libjpeg-turbo-utils \
lynx \
mediainfo \
php7-apcu \
php7-cgi \
php7-ctype \
php7-curl \
php7-dom \
php7-exif \
php7-gd \
php7-imagick \
php7-ldap \
php7-mysqli \
php7-mysqlnd \
php7-pear \
php7-xmlrpc \
php7-xsl \
php7-zip \
php8-apcu \
php8-cgi \
php8-ctype \
php8-curl \
php8-dom \
php8-exif \
php8-gd \
php8-ldap \
php8-mysqli \
php8-mysqlnd \
php8-pear \
php8-pecl-imagick \
php8-xsl \
php8-zip \
poppler-utils \
re2c \
unzip \
wget && \
apk add --no-cache \
--repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
php8-pecl-xmlrpc && \
echo "**** download piwigo ****" && \
if [ -z ${PIWIGO_RELEASE+x} ]; then \
PIWIGO_RELEASE=$(curl -sX GET "https://api.github.com/repos/Piwigo/Piwigo/releases/latest" \
@ -46,13 +48,13 @@ RUN \
/piwigo/piwigo.zip -L \
"https://piwigo.org/download/dlcounter.php?code=${PIWIGO_RELEASE}" && \
# The max filesize is 2M by default, which is way to small for most photos
sed -ri 's/^upload_max_filesize = .*/upload_max_filesize = 100M/' /etc/php7/php.ini && \
sed -ri 's/^upload_max_filesize = .*/upload_max_filesize = 100M/' /etc/php8/php.ini && \
# The max post size is 8M by default, it must be at least max_filesize
sed -ri 's/^post_max_size = .*/post_max_size = 100M/' /etc/php7/php.ini
sed -ri 's/^post_max_size = .*/post_max_size = 100M/' /etc/php8/php.ini
# copy local files
COPY root/ /
# ports and volumes
EXPOSE 80 443
VOLUME /config /gallery
VOLUME /config

40
Dockerfile.armhf
View file

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.15
# set version label
ARG BUILD_DATE
@ -17,25 +17,27 @@ RUN \
libjpeg-turbo-utils \
lynx \
mediainfo \
php7-apcu \
php7-cgi \
php7-ctype \
php7-curl \
php7-dom \
php7-exif \
php7-gd \
php7-imagick \
php7-ldap \
php7-mysqli \
php7-mysqlnd \
php7-pear \
php7-xmlrpc \
php7-xsl \
php7-zip \
php8-apcu \
php8-cgi \
php8-ctype \
php8-curl \
php8-dom \
php8-exif \
php8-gd \
php8-ldap \
php8-mysqli \
php8-mysqlnd \
php8-pear \
php8-pecl-imagick \
php8-xsl \
php8-zip \
poppler-utils \
re2c \
unzip \
wget && \
apk add --no-cache \
--repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
php8-pecl-xmlrpc && \
echo "**** download piwigo ****" && \
if [ -z ${PIWIGO_RELEASE+x} ]; then \
PIWIGO_RELEASE=$(curl -sX GET "https://api.github.com/repos/Piwigo/Piwigo/releases/latest" \
@ -46,13 +48,13 @@ RUN \
/piwigo/piwigo.zip -L \
"https://piwigo.org/download/dlcounter.php?code=${PIWIGO_RELEASE}" && \
# The max filesize is 2M by default, which is way to small for most photos
sed -ri 's/^upload_max_filesize = .*/upload_max_filesize = 100M/' /etc/php7/php.ini && \
sed -ri 's/^upload_max_filesize = .*/upload_max_filesize = 100M/' /etc/php8/php.ini && \
# The max post size is 8M by default, it must be at least max_filesize
sed -ri 's/^post_max_size = .*/post_max_size = 100M/' /etc/php7/php.ini
sed -ri 's/^post_max_size = .*/post_max_size = 100M/' /etc/php8/php.ini
# copy local files
COPY root/ /
# ports and volumes
EXPOSE 80 443
VOLUME /config /gallery
VOLUME /config

1
README.md
View file

@ -229,6 +229,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **20.08.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).
* **29.06.21:** - Rebase to 3.14, Add php7-zip package
* **20.05.21:** - Create separate volume for image data
* **23.01.21:** - Rebasing to alpine 3.13.

24
package_versions.txt Executable file → Normal file
View file

@ -2,7 +2,7 @@ alpine-baselayout-3.2.0-r16
alpine-keys-2.4-r0
alsa-lib-1.2.5-r2
aom-libs-1.0.0-r3
apache2-utils-2.4.54-r0
apache2-utils-2.4.51-r0
apk-tools-2.12.7-r0
apr-1.7.0-r1
apr-util-1.6.1-r7
@ -10,11 +10,11 @@ argon2-libs-20190702-r1
avahi-libs-0.8-r5
bash-5.1.16-r0
brotli-libs-1.0.9-r5
busybox-1.33.1-r8
ca-certificates-20220614-r0
ca-certificates-bundle-20220614-r0
cairo-1.16.0-r5
cairo-gobject-1.16.0-r5
busybox-1.33.1-r6
ca-certificates-20191127-r5
ca-certificates-bundle-20191127-r5
cairo-1.16.0-r3
cairo-gobject-1.16.0-r3
coreutils-8.32-r2
cups-libs-2.3.3-r3
curl-7.79.1-r3
@ -37,8 +37,8 @@ gnutls-3.7.1-r1
graphite2-1.3.14-r0
gzip-1.12-r0
harfbuzz-2.8.1-r0
imagemagick-7.0.11.14-r1
imagemagick-libs-7.0.11.14-r1
imagemagick-7.0.11.14-r0
imagemagick-libs-7.0.11.14-r0
jbig2dec-0.19-r0
lame-3.100-r0
lcms2-2.12-r1
@ -46,7 +46,7 @@ less-581-r1
libacl-2.2.53-r0
libass-0.15.1-r0
libattr-2.5.1-r0
libblkid-2.37.4-r0
libblkid-2.37.2-r0
libbsd-0.11.3-r0
libbz2-1.0.8-r1
libc-utils-0.7.2-r3
@ -72,7 +72,7 @@ libltdl-2.4.6-r7
libmagic-5.40-r1
libmd-1.0.3-r0
libmediainfo-21.03-r0
libmount-2.37.4-r0
libmount-2.37.2-r0
libogg-1.3.5-r0
libpciaccess-0.16-r0
libpng-1.6.37-r1
@ -90,7 +90,7 @@ libstdc++-10.3.1_git20210424-r2
libtasn1-4.17.0-r0
libtheora-1.1.1-r16
libunistring-0.9.10-r1
libuuid-2.37.4-r0
libuuid-2.37.2-r0
libva-2.11.0-r0
libvdpau-1.4-r0
libvorbis-1.3.7-r0
@ -121,7 +121,7 @@ ncurses-libs-6.2_p20210612-r1
ncurses-terminfo-base-6.2_p20210612-r1
nettle-3.7.3-r0
nghttp2-libs-1.43.0-r0
nginx-1.20.2-r1
nginx-1.20.2-r0
oniguruma-6.9.7.1-r0
openjpeg-2.4.0-r1
openssl-1.1.1s-r0

1
readme-vars.yml
View file

@ -46,6 +46,7 @@ app_setup_nginx_reverse_proxy_block: ""
# changelog
changelogs:
- { date: "20.08.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." }
- { date: "29.06.21:", desc: "Rebase to 3.14, Add php7-zip package" }
- { date: "20.05.21:", desc: "Create separate volume for image data" }
- { date: "23.01.21:", desc: "Rebasing to alpine 3.13." }

30
root/defaults/default
View file

@ -1,30 +0,0 @@
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;
}
}

34
root/defaults/nginx/site-confs/default.conf.sample Normal file
View file

@ -0,0 +1,34 @@
## Version 2022/08/20 - Changelog: https://github.com/linuxserver/docker-piwigo/commits/master/root/defaults/nginx/site-confs/default.conf.sample
server {
listen 80 default_server;
listen [::]:80 default_server;
listen 443 ssl http2 default_server;
listen [::]:443 ssl http2 default_server;
server_name _;
root /config/www/gallery;
index index.html index.htm index.php;
location / {
# enable for basic auth
#auth_basic "Restricted";
#auth_basic_user_file /config/nginx/.htpasswd;
try_files $uri $uri/ /index.html /index.php$is_args$args =404;
}
location ~ ^(.+\.php)(.*)$ {
fastcgi_split_path_info ^(.+\.php)(.*)$;
fastcgi_pass 127.0.0.1:9000;
fastcgi_index index.php;
include /etc/nginx/fastcgi_params;
}
# deny access to .htaccess/.htpasswd files
location ~ /\.ht {
deny all;
}
}

6
root/etc/cont-init.d/40-install
View file

@ -22,9 +22,9 @@ if [ ! -d "/config/www/gallery" ]; then
fi
if [[ -d /gallery ]]; then
if [[ "$(stat -c '%U' /gallery)" != "abc" ]]; then
chown -R abc:abc /gallery
fi
if [[ "$(stat -c '%U' /gallery)" != "abc" ]]; then
chown -R abc:abc /gallery
fi
fi
# permissions