diff --git a/Dockerfile b/Dockerfile index 61ccbab6..cb6c518f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # "Build" shimmie (composer install - done in its own stage so that we don't # need to include all the composer fluff in the final image) -FROM debian:stable AS app +FROM debian:bullseye AS app RUN apt update && apt install -y composer php7.4-gd php7.4-dom php7.4-sqlite3 php-xdebug imagemagick COPY composer.json composer.lock /app/ WORKDIR /app @@ -10,7 +10,7 @@ COPY . /app/ # Tests in their own image. Really we should inherit from app and then # `composer install` phpunit on top of that; but for some reason # `composer install --no-dev && composer install` doesn't install dev -FROM debian:stable AS tests +FROM debian:bullseye AS tests RUN apt update && apt install -y composer php7.4-gd php7.4-dom php7.4-sqlite3 php-xdebug imagemagick COPY composer.json composer.lock /app/ WORKDIR /app @@ -25,7 +25,7 @@ RUN [ $RUN_TESTS = false ] || (\ echo '=== Cleaning ===' && rm -rf data) # Build su-exec so that our final image can be nicer -FROM debian:stable AS suexec +FROM debian:bullseye AS suexec RUN apt-get update && apt-get install -y --no-install-recommends gcc libc-dev curl RUN curl -k -o /usr/local/bin/su-exec.c https://raw.githubusercontent.com/ncopa/su-exec/master/su-exec.c; \ gcc -Wall /usr/local/bin/su-exec.c -o/usr/local/bin/su-exec; \ @@ -33,7 +33,7 @@ RUN curl -k -o /usr/local/bin/su-exec.c https://raw.githubusercontent.com/ncopa chmod 0755 /usr/local/bin/su-exec; # Actually run shimmie -FROM debian:stable +FROM debian:bullseye EXPOSE 8000 HEALTHCHECK --interval=1m --timeout=3s CMD curl --fail http://127.0.0.1:8000/ || exit 1 ENV UID=1000 \ diff --git a/core/sys_config.php b/core/sys_config.php index 5511605e..12bef372 100644 --- a/core/sys_config.php +++ b/core/sys_config.php @@ -28,7 +28,7 @@ _d("DEBUG", false); // boolean print various debugging details _d("COOKIE_PREFIX", 'shm'); // string if you run multiple galleries with non-shared logins, give them different prefixes _d("SPEED_HAX", false); // boolean do some questionable things in the name of performance _d("WH_SPLITS", 1); // int how many levels of subfolders to put in the warehouse -_d("VERSION", "2.9.2$_g"); // string shimmie version +_d("VERSION", "2.9.3$_g"); // string shimmie version _d("TIMEZONE", null); // string timezone _d("EXTRA_EXTS", ""); // string optional extra extensions _d("BASE_HREF", null); // string force a specific base URL (default is auto-detect)