From 16fd37cea2ae41c437ce21a1ae6a7bdc6092e076 Mon Sep 17 00:00:00 2001 From: casjay Date: Sat, 17 Aug 2024 19:46:11 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dockerfile rootfs/root/docker/setup/05-custom.sh rootfs/usr/local/etc/docker/init.d/99-nginx.sh --- Dockerfile | 2 +- rootfs/root/docker/setup/05-custom.sh | 2 +- rootfs/usr/local/etc/docker/init.d/99-nginx.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ca7bef9..a8001cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG SHELL_OPTS="set -e -o pipefail" ARG SERVICE_PORT="80" ARG EXPOSE_PORTS="" -ARG PHP_VERSION="php83" +ARG PHP_VERSION="php82" ARG NODE_VERSION="system" ARG NODE_MANAGER="system" diff --git a/rootfs/root/docker/setup/05-custom.sh b/rootfs/root/docker/setup/05-custom.sh index 754f7a7..95f7fb4 100755 --- a/rootfs/root/docker/setup/05-custom.sh +++ b/rootfs/root/docker/setup/05-custom.sh @@ -24,7 +24,7 @@ set -o pipefail # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Set env variables exitCode=0 -WWW_ROOT_DIR="/usr/share/httpd/stikked" +WWW_ROOT_DIR="${WWW_ROOT_DIR:-/usr/share/httpd/default}" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Predifined actions diff --git a/rootfs/usr/local/etc/docker/init.d/99-nginx.sh b/rootfs/usr/local/etc/docker/init.d/99-nginx.sh index cc48301..283bf10 100755 --- a/rootfs/usr/local/etc/docker/init.d/99-nginx.sh +++ b/rootfs/usr/local/etc/docker/init.d/99-nginx.sh @@ -73,7 +73,7 @@ DATABASE_BASE_DIR="${DATABASE_BASE_DIR:-/data/db}" DATABASE_DIR="${DATABASE_DIR_NGINX:-$DATABASE_BASE_DIR/sqlite}" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Set webroot -WWW_ROOT_DIR="/usr/share/httpd/default" +WWW_ROOT_DIR="${WWW_ROOT_DIR:-/usr/share/httpd/default}" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Default predefined variables DATA_DIR="/data/nginx" # set data directory