Skip to content
This repository has been archived by the owner on Oct 18, 2022. It is now read-only.

Commit

Permalink
Use standard nginx.conf from lsio alpine nginx base image
Browse files Browse the repository at this point in the history
  • Loading branch information
nemchik committed Aug 14, 2022
1 parent f68f503 commit a6650e0
Show file tree
Hide file tree
Showing 10 changed files with 132 additions and 123 deletions.
47 changes: 23 additions & 24 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.13
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.15

# set version label
ARG BUILD_DATE
Expand All @@ -8,33 +8,32 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="sparklyballs"

RUN \
echo "**** install runtime packages ****" && \
apk add --no-cache \
curl \
fbida-exiftran \
ffmpeg \
imagemagick \
jq \
php7-exif \
php7-gd \
php7-imagick \
zip && \
echo "**** Tag this image with current version ****" && \
if [ -z ${PHOTOSHOW_COMMIT+x} ]; then \
echo "**** install runtime packages ****" && \
apk add --no-cache \
curl \
fbida-exiftran \
ffmpeg \
imagemagick \
jq \
php8-exif \
php8-gd \
php8-pecl-imagick \
zip && \
echo "**** Tag this image with current version ****" && \
if [ -z ${PHOTOSHOW_COMMIT+x} ]; then \
PHOTOSHOW_COMMIT=$(curl -sX GET https://api.github.com/repos/thibaud-rohmer/PhotoShow/commits/master \
| jq -r '. | .sha'); \
fi && \
echo ${PHOTOSHOW_COMMIT} > /version.txt && \
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
fi && \
echo ${PHOTOSHOW_COMMIT} > /version.txt && \
echo "**** configure php ****" && \
echo "[www]" >> /etc/php8/php-fpm.conf && \
echo "php_admin_value[upload_max_filesize] = 10M" >> /etc/php8/php-fpm.conf && \
echo "php_admin_value[post_max_size] = 10M" >> /etc/php8/php-fpm.conf && \
echo "php_admin_value[memory_limit] = 64M" >> /etc/php8/php-fpm.conf && \
echo "php_admin_value[max_execution_time] = 15" >> /etc/php8/php-fpm.conf

# add local files
COPY root/ /

# ports and volumes
EXPOSE 80
VOLUME /config /Thumbs /Pictures
EXPOSE 80 443
47 changes: 23 additions & 24 deletions Dockerfile.aarch64
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.13
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.15

# set version label
ARG BUILD_DATE
Expand All @@ -8,33 +8,32 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="sparklyballs"

RUN \
echo "**** install runtime packages ****" && \
apk add --no-cache \
curl \
fbida-exiftran \
ffmpeg \
imagemagick \
jq \
php7-exif \
php7-gd \
php7-imagick \
zip && \
echo "**** Tag this image with current version ****" && \
if [ -z ${PHOTOSHOW_COMMIT+x} ]; then \
echo "**** install runtime packages ****" && \
apk add --no-cache \
curl \
fbida-exiftran \
ffmpeg \
imagemagick \
jq \
php8-exif \
php8-gd \
php8-pecl-imagick \
zip && \
echo "**** Tag this image with current version ****" && \
if [ -z ${PHOTOSHOW_COMMIT+x} ]; then \
PHOTOSHOW_COMMIT=$(curl -sX GET https://api.github.com/repos/thibaud-rohmer/PhotoShow/commits/master \
| jq -r '. | .sha'); \
fi && \
echo ${PHOTOSHOW_COMMIT} > /version.txt && \
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
fi && \
echo ${PHOTOSHOW_COMMIT} > /version.txt && \
echo "**** configure php ****" && \
echo "[www]" >> /etc/php8/php-fpm.conf && \
echo "php_admin_value[upload_max_filesize] = 10M" >> /etc/php8/php-fpm.conf && \
echo "php_admin_value[post_max_size] = 10M" >> /etc/php8/php-fpm.conf && \
echo "php_admin_value[memory_limit] = 64M" >> /etc/php8/php-fpm.conf && \
echo "php_admin_value[max_execution_time] = 15" >> /etc/php8/php-fpm.conf

# add local files
COPY root/ /

# ports and volumes
EXPOSE 80
VOLUME /config /Thumbs /Pictures
EXPOSE 80 443
47 changes: 23 additions & 24 deletions Dockerfile.armhf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.13
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.15

# set version label
ARG BUILD_DATE
Expand All @@ -8,33 +8,32 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="sparklyballs"

RUN \
echo "**** install runtime packages ****" && \
apk add --no-cache \
curl \
fbida-exiftran \
ffmpeg \
imagemagick \
jq \
php7-exif \
php7-gd \
php7-imagick \
zip && \
echo "**** Tag this image with current version ****" && \
if [ -z ${PHOTOSHOW_COMMIT+x} ]; then \
echo "**** install runtime packages ****" && \
apk add --no-cache \
curl \
fbida-exiftran \
ffmpeg \
imagemagick \
jq \
php8-exif \
php8-gd \
php8-pecl-imagick \
zip && \
echo "**** Tag this image with current version ****" && \
if [ -z ${PHOTOSHOW_COMMIT+x} ]; then \
PHOTOSHOW_COMMIT=$(curl -sX GET https://api.github.com/repos/thibaud-rohmer/PhotoShow/commits/master \
| jq -r '. | .sha'); \
fi && \
echo ${PHOTOSHOW_COMMIT} > /version.txt && \
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
fi && \
echo ${PHOTOSHOW_COMMIT} > /version.txt && \
echo "**** configure php ****" && \
echo "[www]" >> /etc/php8/php-fpm.conf && \
echo "php_admin_value[upload_max_filesize] = 10M" >> /etc/php8/php-fpm.conf && \
echo "php_admin_value[post_max_size] = 10M" >> /etc/php8/php-fpm.conf && \
echo "php_admin_value[memory_limit] = 64M" >> /etc/php8/php-fpm.conf && \
echo "php_admin_value[max_execution_time] = 15" >> /etc/php8/php-fpm.conf

# add local files
COPY root/ /

# ports and volumes
EXPOSE 80
VOLUME /config /Thumbs /Pictures
EXPOSE 80 443
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **12.08.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes in base](https://github.com/linuxserver/docker-baseimage-alpine-nginx/pull/84)).
* **23.01.21:** - Rebasing to alpine 3.13.
* **01.06.20:** - Rebasing to alpine 3.12.
* **19.12.19:** - Rebasing to alpine 3.11.
Expand Down
20 changes: 10 additions & 10 deletions package_versions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ alpine-baselayout-3.2.0-r8
alpine-keys-2.4-r0
alsa-lib-1.2.4-r2
aom-libs-1.0.0-r1
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
argon2-libs-20190702-r1
avahi-libs-0.8-r4
bash-5.1.16-r0
brotli-libs-1.0.9-r3
busybox-1.32.1-r9
ca-certificates-20220614-r0
ca-certificates-bundle-20220614-r0
cairo-1.16.0-r4
cairo-gobject-1.16.0-r4
busybox-1.32.1-r7
ca-certificates-20191127-r5
ca-certificates-bundle-20191127-r5
cairo-1.16.0-r2
cairo-gobject-1.16.0-r2
coreutils-8.32-r2
cups-libs-2.3.3-r2
curl-7.79.1-r2
Expand Down Expand Up @@ -113,7 +113,7 @@ opus-1.3.1-r1
p11-kit-0.23.22-r0
pango-1.48.2-r0
pcre-8.44-r0
pcre2-10.36-r1
pcre2-10.36-r0
php7-7.4.26-r0
php7-common-7.4.26-r0
php7-exif-7.4.26-r0
Expand All @@ -140,9 +140,9 @@ shadow-4.8.1-r0
shared-mime-info-2.0-r0
skalibs-2.10.0.0-r0
soxr-0.1.3-r2
ssl_client-1.32.1-r9
tiff-4.3.0-r0
tzdata-2022a-r0
ssl_client-1.32.1-r7
tiff-4.2.0-r0
tzdata-2021e-r0
unzip-6.0-r9
utmps-0.1.0.0-r0
v4l-utils-libs-1.20.0-r0
Expand Down
1 change: 1 addition & 0 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "12.08.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes in base](https://github.com/linuxserver/docker-baseimage-alpine-nginx/pull/84))." }
- { date: "23.01.21:", desc: "Rebasing to alpine 3.13." }
- { date: "01.06.20:", desc: "Rebasing to alpine 3.12." }
- { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
Expand Down
22 changes: 0 additions & 22 deletions root/defaults/default

This file was deleted.

35 changes: 35 additions & 0 deletions root/defaults/nginx/site-confs/default.conf.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
## Version 2022/08/12 - Changelog: https://github.com/linuxserver/docker-photoshow/commits/master/root/defaults/nginx/site-confs/default.conf.sample

server {
listen 80 default_server;
listen [::]:80 default_server;

listen 443 ssl http2;
listen [::]:443 ssl http2;

server_name _;

root /config/www/PhotoShow/;
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?$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;
fastcgi_param SCRIPT_FILENAME /config/www/PhotoShow/$fastcgi_script_name;
}

# deny access to .htaccess/.htpasswd files
location ~ /\.ht {
deny all;
}
}
5 changes: 0 additions & 5 deletions root/defaults/photoshow.fpm

This file was deleted.

30 changes: 16 additions & 14 deletions root/etc/cont-init.d/40-install
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
#!/usr/bin/with-contenv bash

# fix for linting
declare config
# folders
mkdir -p \
/Pictures \
/Thumbs

# Set version
PHOTOSHOW_COMMIT=$(cat /version.txt)

# install photoshow
if [ ! -d "/config/www/PhotoShow/.git" ]; then
echo "fetching photoshow files from github"
git clone https://github.com/thibaud-rohmer/PhotoShow.git /config/www/PhotoShow
git --git-dir=/config/www/PhotoShow/.git --work-tree=/config/www/PhotoShow checkout ${PHOTOSHOW_COMMIT}
sed -i \
-e "s#$config->photos_dir.*#$config->photos_dir = \"/Pictures\";#g" \
-e "s#$config->ps_generated.*#$config->ps_generated = \"/Thumbs\";#g" \
-e "s#.*config->timezone.*#\$config->timezone = \"${TZ}\";#g" \
/config/www/PhotoShow/config.php
echo "fetching photoshow files from github"
git clone https://github.com/thibaud-rohmer/PhotoShow.git /config/www/PhotoShow
git --git-dir=/config/www/PhotoShow/.git --work-tree=/config/www/PhotoShow checkout "${PHOTOSHOW_COMMIT}"
sed -i \
-e "s/\$config->photos_dir.*/\$config->photos_dir = \"\/Pictures\";/g" \
-e "s/\$config->ps_generated.*/\$config->ps_generated = \"\/Thumbs\";/g" \
-e "s/#\$config->timezone.*/\$config->timezone = \"${TZ}\";/g" \
/config/www/PhotoShow/config.php

# patch in fixed keyboard.js file
cp /defaults/keyboard.js /config/www/PhotoShow/src/js/keyboard.js
# patch in fixed keyboard.js file
cp /defaults/keyboard.js /config/www/PhotoShow/src/js/keyboard.js
fi

# permissions
chown -R abc:abc \
/config/www/PhotoShow \
/Thumbs
/config/www/PhotoShow \
/Thumbs

0 comments on commit a6650e0

Please sign in to comment.