Merge pull request #45 from linuxserver/gallery-move

This commit is contained in:
Roxedus 2021-05-22 16:06:58 +02:00 committed by GitHub
commit 62c3fccc81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 148 additions and 133 deletions

View file

@ -8,50 +8,50 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="sparklyballs"
RUN \
echo "**** install packages ****" && \
apk add --no-cache --upgrade \
curl \
exiftool \
ffmpeg \
imagemagick \
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 \
poppler-utils \
re2c \
unzip \
wget && \
echo "**** download piwigo ****" && \
if [ -z ${PIWIGO_RELEASE+x} ]; then \
PIWIGO_RELEASE=$(curl -sX GET "https://api.github.com/repos/Piwigo/Piwigo/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \
mkdir /piwigo && \
curl -o \
/piwigo/piwigo.zip -L \
"http://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 && \
# 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
echo "**** install packages ****" && \
apk add --no-cache --upgrade \
curl \
exiftool \
ffmpeg \
imagemagick \
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 \
poppler-utils \
re2c \
unzip \
wget && \
echo "**** download piwigo ****" && \
if [ -z ${PIWIGO_RELEASE+x} ]; then \
PIWIGO_RELEASE=$(curl -sX GET "https://api.github.com/repos/Piwigo/Piwigo/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \
mkdir /piwigo && \
curl -o \
/piwigo/piwigo.zip -L \
"http://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 && \
# 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
# copy local files
COPY root/ /
# ports and volumes
EXPOSE 80 443
VOLUME /config /pictures
VOLUME /config /gallery

View file

@ -8,50 +8,50 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="sparklyballs"
RUN \
echo "**** install packages ****" && \
apk add --no-cache --upgrade \
curl \
exiftool \
ffmpeg \
imagemagick \
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 \
poppler-utils \
re2c \
unzip \
wget && \
echo "**** download piwigo ****" && \
if [ -z ${PIWIGO_RELEASE+x} ]; then \
PIWIGO_RELEASE=$(curl -sX GET "https://api.github.com/repos/Piwigo/Piwigo/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \
mkdir /piwigo && \
curl -o \
/piwigo/piwigo.zip -L \
"http://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 && \
# 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
echo "**** install packages ****" && \
apk add --no-cache --upgrade \
curl \
exiftool \
ffmpeg \
imagemagick \
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 \
poppler-utils \
re2c \
unzip \
wget && \
echo "**** download piwigo ****" && \
if [ -z ${PIWIGO_RELEASE+x} ]; then \
PIWIGO_RELEASE=$(curl -sX GET "https://api.github.com/repos/Piwigo/Piwigo/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \
mkdir /piwigo && \
curl -o \
/piwigo/piwigo.zip -L \
"http://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 && \
# 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
# copy local files
COPY root/ /
# ports and volumes
EXPOSE 80 443
VOLUME /config /pictures
VOLUME /config /gallery

View file

@ -8,50 +8,50 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="sparklyballs"
RUN \
echo "**** install packages ****" && \
apk add --no-cache --upgrade \
curl \
exiftool \
ffmpeg \
imagemagick \
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 \
poppler-utils \
re2c \
unzip \
wget && \
echo "**** download piwigo ****" && \
if [ -z ${PIWIGO_RELEASE+x} ]; then \
PIWIGO_RELEASE=$(curl -sX GET "https://api.github.com/repos/Piwigo/Piwigo/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \
mkdir /piwigo && \
curl -o \
/piwigo/piwigo.zip -L \
"http://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 && \
# 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
echo "**** install packages ****" && \
apk add --no-cache --upgrade \
curl \
exiftool \
ffmpeg \
imagemagick \
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 \
poppler-utils \
re2c \
unzip \
wget && \
echo "**** download piwigo ****" && \
if [ -z ${PIWIGO_RELEASE+x} ]; then \
PIWIGO_RELEASE=$(curl -sX GET "https://api.github.com/repos/Piwigo/Piwigo/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \
mkdir /piwigo && \
curl -o \
/piwigo/piwigo.zip -L \
"http://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 && \
# 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
# copy local files
COPY root/ /
# ports and volumes
EXPOSE 80 443
VOLUME /config /pictures
VOLUME /config /gallery

View file

@ -22,13 +22,16 @@ param_env_vars:
param_usage_include_vols: true
param_volumes:
- { vol_path: "/config", vol_host_path: "</path/to/appdata/config>", desc: "Configuration files." }
- { vol_path: "/gallery", vol_host_path: "</path/to/appdata/gallery>", desc: "Image, plugin, & theme storage for Piwigo" }
param_usage_include_ports: true
param_ports:
- { external_port: "80", internal_port: "80", port_desc: "Application WebUI" }
# application setup block
app_setup_block_enabled: true
app_setup_block: "* You must create a user and database for piwigo to use in a mysql/mariadb server.
app_setup_block: "Docker image update and recreation of container alone won't update Piwigo version. In order to update Piwigo version, firstly make sure you are using the latest docker image, then go to Admin->Tools->Updates and use the app updater.
* 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.
@ -43,6 +46,7 @@ app_setup_nginx_reverse_proxy_block: ""
# changelog
changelogs:
- { date: "20.05.21:", desc: "Create separate volume for image data" }
- { date: "23.01.21:", desc: "Rebasing to alpine 3.13." }
- { date: "12.12.20:", desc: "Increased upload_max_filesize in php.ini" }
- { date: "01.06.20:", desc: "Rebasing to alpine 3.12." }

View file

@ -2,21 +2,32 @@
# make our folders
mkdir -p \
/config/www/gallery
/gallery
# install piwigo
if [ ! -f "/config/www/gallery/index.php" ]; then
unzip -q /piwigo/piwigo.zip -d /tmp
mv /tmp/piwigo/* /config/www/gallery
rm -rf /tmp/piwigo
if [ ! -f "/config/www/gallery/index.php" ] && [ ! -f "/gallery/index.php" ]; then
unzip -q /piwigo/piwigo.zip -d /tmp
mv /tmp/piwigo/* /gallery
rm -rf /tmp/piwigo
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
if [ ! -f "/config/www/gallery/local/config/config.inc.php" ] && [ ! -f "/gallery/local/config/config.inc.php" ]; then
cp /gallery/include/config_default.inc.php /gallery/local/config/config.inc.php
fi
if [ ! -d "/config/www/gallery" ]; then
ln -s /gallery /config/www/gallery
fi
if [[ -d /gallery ]]; then
if [[ "$(stat -c '%U' /gallery)" != "abc" ]]; then
chown -R abc:abc /gallery
fi
fi
# permissions
chown -R abc:abc \
/config
/config