From 83fc170812f18df74b6b655d835fefa8054f1650 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Thu, 14 Oct 2021 16:15:58 -0500 Subject: [PATCH] Use standard nginx.conf from lsio alpine nginx base image --- Dockerfile | 31 +++++------- Dockerfile.aarch64 | 31 +++++------- Dockerfile.armhf | 31 +++++------- README.md | 5 +- package_versions.txt | 14 +++--- readme-vars.yml | 5 +- root/defaults/default | 41 ---------------- .../nginx/site-confs/default.conf.sample | 47 +++++++++++++++++++ root/etc/cont-init.d/50-config | 2 +- 9 files changed, 100 insertions(+), 107 deletions(-) delete mode 100644 root/defaults/default create mode 100644 root/defaults/nginx/site-confs/default.conf.sample diff --git a/Dockerfile b/Dockerfile index 93c7631..dbbd1f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,25 +8,22 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="gilbn" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - composer && \ echo "**** install runtime packages ****" && \ apk add --no-cache \ curl \ - php7 \ - php7-sqlite3 \ - php7-mysqli \ - php7-pdo_mysql \ - php7-pdo_sqlite \ - php7-gd \ - php7-json \ - php7-fileinfo \ - php7-zip \ - php7-ftp \ - php7-ldap \ - php7-tokenizer \ - php7-intl && \ + php8 \ + php8-sqlite3 \ + php8-mysqli \ + php8-pdo_mysql \ + php8-pdo_sqlite \ + php8-gd \ + php8-json \ + php8-fileinfo \ + php8-zip \ + php8-ftp \ + php8-ldap \ + php8-tokenizer \ + php8-intl && \ echo "**** install xbackbone ****" && \ mkdir -p /app/xbackbone && \ if [ -z ${XBACKBONE_RELEASE+x} ]; then \ @@ -38,8 +35,6 @@ RUN \ "https://github.com/SergiX44/XBackBone/releases/download/${XBACKBONE_RELEASE}/release-v${XBACKBONE_RELEASE}.zip" && \ unzip -q -o /tmp/xbackbone.zip -d /app/xbackbone/ && \ echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ rm -rf \ /root/.cache \ /tmp/* diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index fc42295..782e341 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -8,25 +8,22 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="gilbn" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - composer && \ echo "**** install runtime packages ****" && \ apk add --no-cache \ curl \ - php7 \ - php7-sqlite3 \ - php7-mysqli \ - php7-pdo_mysql \ - php7-pdo_sqlite \ - php7-gd \ - php7-json \ - php7-fileinfo \ - php7-zip \ - php7-ftp \ - php7-ldap \ - php7-tokenizer \ - php7-intl && \ + php8 \ + php8-sqlite3 \ + php8-mysqli \ + php8-pdo_mysql \ + php8-pdo_sqlite \ + php8-gd \ + php8-json \ + php8-fileinfo \ + php8-zip \ + php8-ftp \ + php8-ldap \ + php8-tokenizer \ + php8-intl && \ echo "**** install xbackbone ****" && \ mkdir -p /app/xbackbone && \ if [ -z ${XBACKBONE_RELEASE+x} ]; then \ @@ -38,8 +35,6 @@ RUN \ "https://github.com/SergiX44/XBackBone/releases/download/${XBACKBONE_RELEASE}/release-v${XBACKBONE_RELEASE}.zip" && \ unzip -q -o /tmp/xbackbone.zip -d /app/xbackbone/ && \ echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ rm -rf \ /root/.cache \ /tmp/* diff --git a/Dockerfile.armhf b/Dockerfile.armhf index ef8f0a8..a137091 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -8,25 +8,22 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="gilbn" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - composer && \ echo "**** install runtime packages ****" && \ apk add --no-cache \ curl \ - php7 \ - php7-sqlite3 \ - php7-mysqli \ - php7-pdo_mysql \ - php7-pdo_sqlite \ - php7-gd \ - php7-json \ - php7-fileinfo \ - php7-zip \ - php7-ftp \ - php7-ldap \ - php7-tokenizer \ - php7-intl && \ + php8 \ + php8-sqlite3 \ + php8-mysqli \ + php8-pdo_mysql \ + php8-pdo_sqlite \ + php8-gd \ + php8-json \ + php8-fileinfo \ + php8-zip \ + php8-ftp \ + php8-ldap \ + php8-tokenizer \ + php8-intl && \ echo "**** install xbackbone ****" && \ mkdir -p /app/xbackbone && \ if [ -z ${XBACKBONE_RELEASE+x} ]; then \ @@ -38,8 +35,6 @@ RUN \ "https://github.com/SergiX44/XBackBone/releases/download/${XBACKBONE_RELEASE}/release-v${XBACKBONE_RELEASE}.zip" && \ unzip -q -o /tmp/xbackbone.zip -d /app/xbackbone/ && \ echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ rm -rf \ /root/.cache \ /tmp/* diff --git a/README.md b/README.md index c644ce0..b6b5fcc 100644 --- a/README.md +++ b/README.md @@ -238,5 +238,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **02.08.2022:** - Added note about updating. -* **06.06.2021:** - Initial Release. +* **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)). +* **02.08.22:** - Added note about updating. +* **06.06.21:** - Initial Release. diff --git a/package_versions.txt b/package_versions.txt index 5e2ab72..01634f5 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,15 +1,15 @@ alpine-baselayout-3.2.0-r8 alpine-keys-2.4-r0 -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 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 +busybox-1.32.1-r7 +ca-certificates-20191127-r5 +ca-certificates-bundle-20191127-r5 coreutils-8.32-r2 curl-7.79.1-r2 expat-2.2.10-r6 @@ -63,7 +63,7 @@ nginx-1.18.0-r15 oniguruma-6.9.6-r0 openssl-1.1.1q-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-fileinfo-7.4.26-r0 @@ -95,8 +95,8 @@ scanelf-1.2.8-r0 shadow-4.8.1-r0 skalibs-2.10.0.0-r0 sqlite-libs-3.34.1-r0 -ssl_client-1.32.1-r9 -tzdata-2022a-r0 +ssl_client-1.32.1-r7 +tzdata-2021e-r0 utmps-0.1.0.0-r0 xz-5.2.5-r1 xz-libs-5.2.5-r1 diff --git a/readme-vars.yml b/readme-vars.yml index e74efeb..1c26eb4 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -49,5 +49,6 @@ app_setup_block: | # changelog changelogs: - - { date: "02.08.2022:", desc: "Added note about updating." } - - { date: "06.06.2021:", desc: "Initial Release." } + - { 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: "02.08.22:", desc: "Added note about updating." } + - { date: "06.06.21:", desc: "Initial Release." } diff --git a/root/defaults/default b/root/defaults/default deleted file mode 100644 index 40a0edf..0000000 --- a/root/defaults/default +++ /dev/null @@ -1,41 +0,0 @@ -server { - listen 80; - - listen 443 ssl; - - root /config/www/xbackbone; - index index.html index.htm index.php; - - server_name _; - - ssl_certificate /config/keys/cert.crt; - ssl_certificate_key /config/keys/cert.key; - - charset utf-8; - - error_page 404 /index.php; - - client_max_body_size 2G; - - location / { - try_files $uri $uri/ /index.php?$query_string; - } - - location ~ \.php$ { - fastcgi_pass 127.0.0.1:9000; - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name; - fastcgi_param SCRIPT_NAME $fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - autoindex off; - location ~ ^\.md { - return 404; - } - - location ~ ^/(app|bin|bootstrap|resources|storage|vendor|logs) { - return 403; - } -} diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample new file mode 100644 index 0000000..fff7085 --- /dev/null +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -0,0 +1,47 @@ +## Version 2022/08/20 - Changelog: https://github.com/linuxserver/docker-xbackbone/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/xbackbone; + index index.html index.htm index.php; + + charset utf-8; + error_page 404 /index.php; + client_max_body_size 2G; + + 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; + } + + # deny access to .htaccess/.htpasswd files + location ~ /\.ht { + deny all; + } + + autoindex off; + location ~ ^\.md { + return 404; + } + + location ~ ^/(app|bin|bootstrap|resources|storage|vendor|logs) { + return 403; + } +} diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 3ce85c2..705da1e 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/with-contenv bash # create folders mkdir -p /config/www/xbackbone