casjaysdevdocker/php
1
0
Fork 0
mirror of https://github.com/casjaysdevdocker/php synced 2025-05-10 08:11:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

🗃️ Committing everything that changed 🗃️
Some checks failed
php-8 / release-php-8 (push) Successful in 2h2m40s
Details
php-7 / release-php-7 (push) Failing after 3h5m20s
Details
php-latest / release-php-latest (push) Failing after 2h18m59s
Details

Browse Source 
Dockerfile
Dockerfile.7
Dockerfile.8
.env.scripts
.env.scripts.7
.env.scripts.8
rootfs/usr/local/etc/docker/init.d/01-php.sh
rootfs/usr/local/etc/docker/init.d/05-php-fpm.sh
rootfs/usr/local/share/template-files/config/env/default.sample
This commit is contained in:
casjay 2025-02-03 15:20:01 -05:00
parent e8c3e67ca1
commit 24c83e50ad
Signed by untrusted user who does not match committer: jason
GPG Key ID: 1AB309F42A764145
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.scripts
View File

@ -50,7 +50,7 @@ NODE_VERSION="system"
NODE_MANAGER="system"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Default directories
WWW_ROOT_DIR="/usr/share/httpd/default"
WWW_ROOT_DIR="/usr/local/share/httpd/default"
DEFAULT_FILE_DIR="/usr/local/share/template-files"
DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
DEFAULT_CONF_DIR="/usr/local/share/template-files/config"

2
.env.scripts.7
View File

@ -50,7 +50,7 @@ NODE_VERSION="system"
NODE_MANAGER="system"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Default directories
WWW_ROOT_DIR="/usr/share/httpd/default"
WWW_ROOT_DIR="/usr/local/share/httpd/default"
DEFAULT_FILE_DIR="/usr/local/share/template-files"
DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
DEFAULT_CONF_DIR="/usr/local/share/template-files/config"

2
.env.scripts.8
View File

@ -50,7 +50,7 @@ NODE_VERSION="system"
NODE_MANAGER="system"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Default directories
WWW_ROOT_DIR="/usr/share/httpd/default"
WWW_ROOT_DIR="/usr/local/share/httpd/default"
DEFAULT_FILE_DIR="/usr/local/share/template-files"
DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
DEFAULT_CONF_DIR="/usr/local/share/template-files/config"

2
Dockerfile
View File

@ -5,7 +5,7 @@ ARG PHP_SERVER="php"
ARG BUILD_DATE="202410090957"
ARG LANGUAGE="en_US.UTF-8"
ARG TIMEZONE="America/New_York"
ARG WWW_ROOT_DIR="/usr/share/httpd/default"
ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"

2
Dockerfile.7
View File

@ -5,7 +5,7 @@ ARG PHP_SERVER="php"
ARG BUILD_DATE="202410090957"
ARG LANGUAGE="en_US.UTF-8"
ARG TIMEZONE="America/New_York"
ARG WWW_ROOT_DIR="/usr/share/httpd/default"
ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"

2
Dockerfile.8
View File

@ -5,7 +5,7 @@ ARG PHP_SERVER="php"
ARG BUILD_DATE="202410090957"
ARG LANGUAGE="en_US.UTF-8"
ARG TIMEZONE="America/New_York"
ARG WWW_ROOT_DIR="/usr/share/httpd/default"
ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"

6
rootfs/usr/local/etc/docker/init.d/01-php.sh
View File

@ -62,7 +62,7 @@ START_SCRIPT="/usr/local/etc/docker/exec/$SERVICE_NAME"
RESET_ENV="no"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Set webroot
WWW_ROOT_DIR="/usr/share/httpd/default"
WWW_ROOT_DIR="/usr/local/share/httpd/default"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Default predefined variables
DATA_DIR="/data/php" # set data directory
@ -204,9 +204,9 @@ __run_pre_execute_checks() {
{ [ -d "/data/htdocs/www" ] && PHP_DEV_SERVER_ROOT="/data/htdocs/www"; } || { [ -d "/data/www" ] && PHP_DEV_SERVER_ROOT="/data/www"; }
WWW_ROOT_DIR="$PHP_DEV_SERVER_ROOT"
[ -d "$WWW_ROOT_DIR" ] || mkdir -p "$WWW_ROOT_DIR"
if [ -d "/usr/share/httpd/default" ]; then
if [ -d "/usr/local/share/httpd/default" ]; then
if [ ! -d "$WWW_ROOT_DIR" ] || __is_dir_empty "$WWW_ROOT_DIR"; then
__file_copy "/usr/share/httpd/default" "$WWW_ROOT_DIR"
__file_copy "/usr/local/share/httpd/default" "$WWW_ROOT_DIR"
fi
elif [ ! -d "$WWW_ROOT_DIR" ]; then
mkdir -p "$WWW_ROOT_DIR"

2
rootfs/usr/local/etc/docker/init.d/05-php-fpm.sh
View File

@ -62,7 +62,7 @@ START_SCRIPT="/usr/local/etc/docker/exec/$SERVICE_NAME"
RESET_ENV="no"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Set webroot
WWW_ROOT_DIR="/usr/share/httpd/default"
WWW_ROOT_DIR="/usr/local/share/httpd/default"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Default predefined variables
DATA_DIR="/data/php-fpm" # set data directory

2
rootfs/usr/local/share/template-files/config/env/default.sample vendored
View File

@ -14,7 +14,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# directory settings
#BACKUP_DIR="${BACKUP_DIR:-/data/backups}"
#WWW_ROOT_DIR="${WWW_ROOT_DIR:-/usr/share/httpd/default}"
#WWW_ROOT_DIR="${WWW_ROOT_DIR:-/usr/local/share/httpd/default}"
#LOCAL_BIN_DIR="${LOCAL_BIN_DIR:-/usr/local/bin}"
#DATABASE_BASE_DIR="${DATABASE_BASE_DIR:-/data/db}"
#DEFAULT_DATA_DIR="${DEFAULT_DATA_DIR:-/usr/local/share/template-files/data}"