cphipps/watchstate
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

some changes to account for edge cases when running on unraid.

Browse Source
This commit is contained in:
Abdulmhsen B. A. A
2023-02-07 20:35:50 +03:00
parent 31dcddc490
commit 92a2c5c2c5
5 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Dockerfile
View File

@@ -8,6 +8,7 @@ ARG TZ=UTC
ARG PHP_V=php82
ARG PHP_PACKAGES="common ctype curl dom fileinfo fpm intl mbstring opcache pcntl pdo_sqlite phar posix session shmop simplexml snmp sockets sodium sysvmsg sysvsem sysvshm tokenizer xml openssl xmlreader xmlwriter zip pecl-igbinary pecl-xhprof pecl-redis"
ARG TOOL_PATH=/opt/app
ARG USER_ID=1000
ENV IN_CONTAINER=1
ENV PHP_INI_DIR=/etc/${PHP_V}
@@ -27,7 +28,7 @@ RUN ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime && echo ${TZ} > /etc/timezo
# Delete unused users change users group gid to allow unRaid users to use gid 100
deluser redis && deluser caddy && groupmod -g 1588787 users && \
# Create our own user.
useradd -u 1000 -U -d /config -s /bin/bash user
useradd -u ${USER_ID:-1000} -U -d /config -s /bin/bash user
# Copy source code to container.
#
@@ -37,7 +38,7 @@ COPY ./ /opt/app
#
RUN echo '' && \
# Create basic directories.
bash -c 'mkdir -p /temp_data/ /opt/{app,bin,config} /config/{backup,cache,config,db,debug,logs,webhooks}' && \
bash -c 'umask 0000 && mkdir -p /temp_data/ /opt/{app,bin,config} /config/{backup,cache,config,db,debug,logs,webhooks,profiler}' && \
# Link console & php.
bash -c "ln -s /usr/sbin/php-fpm${PHP_V:3} /usr/sbin/php-fpm" && \
ln -s /usr/bin/${PHP_V} /usr/bin/php && ln -s ${TOOL_PATH}/bin/console /opt/bin/console && \
@@ -63,7 +64,7 @@ RUN echo '' && \
# Remove unneeded directories and tools.
bash -c 'rm -rf /temp_data/ /opt/bin/composer ${TOOL_PATH}/{container,var,.github,.git,.env}' && \
# Change Permissions.
chown -R user:user /config /opt /var/log/ && chmod -R 775 /var/log/
chown -R user:user /config /opt /var/log && chmod -R 777 /var/log /etc/${PHP_V}
# Set the entrypoint.
#

5
config/config.php
View File

@@ -58,8 +58,11 @@ return (function () {
$config['tmpDir'] = fixPath(env('WS_TMP_DIR', ag($config, 'path')));
$dbFile = ag($config, 'path') . '/db/watchstate_' . ag($config, 'database.version') . '.db';
$config['database'] += [
'dsn' => 'sqlite:' . ag($config, 'path') . '/db/watchstate_' . ag($config, 'database.version') . '.db',
'file' => $dbFile,
'dsn' => 'sqlite:' . $dbFile,
'username' => null,
'password' => null,
'options' => [

7
config/services.php
View File

@@ -119,8 +119,15 @@ return (function (): array {
PDO::class => [
'class' => function (): PDO {
$dbFile = Config::get('database.file');
$changePerm = !file_exists($dbFile);
$pdo = new PDO(dsn: Config::get('database.dsn'), options: Config::get('database.options', []));
if ($changePerm && inContainer() && 777 !== (int)(decoct(fileperms($dbFile) & 0777))) {
@chmod($dbFile, 0777);
}
foreach (Config::get('database.exec', []) as $cmd) {
$pdo->exec($cmd);
}

3
container/files/init-container.sh
View File

@@ -4,6 +4,9 @@ set -e
DATA_PATH="${WS_DATA_PATH:-/config}"
ENV_FILE="${DATA_PATH}/config/.env"
TIME_DATE=$(date +"%Y-%m-%dT%H:%M:%S%z")
WS_UMASK="${WS_UMASK:-0000}"
umask "${WS_UMASK}"
if [ ! -w "${DATA_PATH}" ]; then
CH_USER=$(stat -c "%u" "${DATA_PATH}")

2
container/files/job-runner.sh
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash
PID="/opt/job-runner.pid"
PID="/tmp/job-runner.pid"
# shellcheck disable=SC2064
trap 'rm -f "${PID}"; exit' EXIT SIGQUIT SIGINT SIGTERM ERR