Use standard nginx.conf from lsio alpine nginx base image

linuxserver-archive · Aug 16, 2022 · 9438dda · 9438dda
1 parent 3d39328
commit 9438dda
Show file tree

Hide file tree

Showing 9 changed files with 79 additions and 74 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -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
@@ -8,20 +8,19 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="sparklyballs"
 
 RUN \
- echo "**** install runtime packages ****" && \
- apk add --no-cache \
-	curl \
-	jq && \
- echo "**** Tag this image with current version ****" && \
- if [ -z ${MUXIMUX_COMMIT+x} ]; then \
+  echo "**** install runtime packages ****" && \
+  apk add --no-cache \
+    curl \
+    jq && \
+  echo "**** Tag this image with current version ****" && \
+  if [ -z ${MUXIMUX_COMMIT+x} ]; then \
         MUXIMUX_COMMIT=$(curl -sX GET https://api.github.com/repos/mescon/Muximux/commits/master \
         | jq -r '. | .sha'); \
- fi && \
- echo ${MUXIMUX_COMMIT} > /version.txt
+  fi && \
+  echo ${MUXIMUX_COMMIT} > /version.txt
 
 # add local files
 COPY root/ /
 
 # ports and volumes
-EXPOSE 80
-VOLUME /config
+EXPOSE 80 443
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -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
@@ -8,20 +8,19 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="sparklyballs"
 
 RUN \
- echo "**** install runtime packages ****" && \
- apk add --no-cache \
-	curl \
-	jq && \
- echo "**** Tag this image with current version ****" && \
- if [ -z ${MUXIMUX_COMMIT+x} ]; then \
+  echo "**** install runtime packages ****" && \
+  apk add --no-cache \
+    curl \
+    jq && \
+  echo "**** Tag this image with current version ****" && \
+  if [ -z ${MUXIMUX_COMMIT+x} ]; then \
         MUXIMUX_COMMIT=$(curl -sX GET https://api.github.com/repos/mescon/Muximux/commits/master \
         | jq -r '. | .sha'); \
- fi && \
- echo ${MUXIMUX_COMMIT} > /version.txt
+  fi && \
+  echo ${MUXIMUX_COMMIT} > /version.txt
 
 # add local files
 COPY root/ /
 
 # ports and volumes
-EXPOSE 80
-VOLUME /config
+EXPOSE 80 443
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
@@ -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
@@ -8,20 +8,19 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="sparklyballs"
 
 RUN \
- echo "**** install runtime packages ****" && \
- apk add --no-cache \
-	curl \
-	jq && \
- echo "**** Tag this image with current version ****" && \
- if [ -z ${MUXIMUX_COMMIT+x} ]; then \
+  echo "**** install runtime packages ****" && \
+  apk add --no-cache \
+    curl \
+    jq && \
+  echo "**** Tag this image with current version ****" && \
+  if [ -z ${MUXIMUX_COMMIT+x} ]; then \
         MUXIMUX_COMMIT=$(curl -sX GET https://api.github.com/repos/mescon/Muximux/commits/master \
         | jq -r '. | .sha'); \
- fi && \
- echo ${MUXIMUX_COMMIT} > /version.txt
+  fi && \
+  echo ${MUXIMUX_COMMIT} > /version.txt
 
 # add local files
 COPY root/ /
 
 # ports and volumes
-EXPOSE 80
-VOLUME /config
+EXPOSE 80 443
diff --git a/README.md b/README.md
@@ -222,6 +222,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)).
 * **23.01.21:** - Rebasing to alpine 3.13.
 * **01.06.20:** - Rebasing to alpine 3.12.
 * **19.12.19:** - Rebasing to alpine 3.11.

diff --git 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
@@ -42,7 +42,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
@@ -61,8 +61,8 @@ s6-ipcserver-2.10.0.0-r0
 scanelf-1.2.8-r0
 shadow-4.8.1-r0
 skalibs-2.10.0.0-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
@@ -49,6 +49,7 @@ app_setup_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: "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." }

diff --git a/root/defaults/default b/root/defaults/default
diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample
@@ -0,0 +1,35 @@
+## Version 2022/08/20 - Changelog: https://github.com/linuxserver/docker-muximux/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/muximux;
+
+    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;
+    }
+
+    # deny access to .htaccess/.htpasswd files
+    location ~ /\.ht {
+        deny all;
+    }
+}
diff --git a/root/etc/cont-init.d/40-install b/root/etc/cont-init.d/40-install
@@ -4,10 +4,11 @@
 MUXIMUX_COMMIT=$(cat /version.txt)
 
 # fetch site
-[[ ! -d /config/www/muximux/.git ]] && \
-	git clone https://github.com/mescon/Muximux /config/www/muximux
-	git --git-dir=/config/www/muximux/.git --work-tree=/config/www/muximux checkout ${MUXIMUX_COMMIT}
+if [[ ! -d /config/www/muximux/.git ]]; then
+    git clone https://github.com/mescon/Muximux /config/www/muximux
+fi
+git --git-dir=/config/www/muximux/.git --work-tree=/config/www/muximux checkout ${MUXIMUX_COMMIT}
 
 # permissions
 chown -R abc:abc \
-	/config/www
+    /config/www