docs: improve consistency of torrent action headings

.docker/gitlab.Dockerfile

@@ -1,10 +1,11 @@
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 WORKDIR /var/www
 
-ENV DEBIAN_FRONTEND noninteractive
-ENV PHP_VER 8.2
-ENV NODE_VERSION 20
+ENV DEB_RELEASE=bookworm
+ENV DEBIAN_FRONTEND=noninteractive
+ENV PHP_VER=8.3
+ENV NODE_VERSION=20
 
 # Uncomment to skip the chromium download when installing puppeteer. If you do,
 # you'll need to launch puppeteer with:
@@ -20,7 +21,7 @@ RUN apt-get update \
         gnupg2 \
     && mkdir -p /etc/apt/keyrings \
     && curl -sL https://packages.sury.org/php/apt.gpg | apt-key add - \
-    && echo "deb https://packages.sury.org/php/ bullseye main" | tee /etc/apt/sources.list.d/php.list \
+    && echo "deb https://packages.sury.org/php/ $DEB_RELEASE main" | tee /etc/apt/sources.list.d/php.list \
     && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
     && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_${NODE_VERSION}.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
     && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
@@ -30,7 +31,7 @@ RUN apt-get update \
         make \
         mktorrent \
         nginx \
-        netcat \
+        netcat-openbsd \
         nodejs \
         php${PHP_VER}-cli \
         php${PHP_VER}-curl \
@@ -95,13 +96,13 @@ RUN apt-get update \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
     # Python tools layer
-    && pip3 install chardet eac-logchecker xld-logchecker
+    && pip3 install --break-system-packages chardet eac-logchecker xld-logchecker
 
 # testing layer
 # backports needed for sphinx
 # sphinx needs its config that cannot be passed through a gitlab CI service
 # hence it is installed in this container
-RUN echo 'deb http://deb.debian.org/debian bullseye-backports main' > /etc/apt/sources.list.d/backports.list \
+RUN echo "deb http://deb.debian.org/debian ${DEB_RELEASE}-backports main" > /etc/apt/sources.list.d/backports.list \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
         postgresql-client \
@@ -132,7 +133,7 @@ RUN echo 'deb http://deb.debian.org/debian bullseye-backports main' > /etc/apt/s
 #    && rm /tmp/firefox.tar.bz2 \
 #    && ln -fs /opt/firefox/firefox /usr/bin/firefox
 
-COPY --from=composer:2.6.6 /usr/bin/composer /usr/local/bin/composer
+COPY --from=composer:2.7.7 /usr/bin/composer /usr/local/bin/composer
 COPY .docker /var/www/.docker
 
 # Permissions and configuration layer

.docker/sphinxsearch/sphinx.conf

@@ -85,8 +85,8 @@ source torrents : torrents_base {
         INNER JOIN sphinx_tg AS g ON (t.gid = g.id)
     sql_joined_field = artistname from query; \
         SELECT t.id, aname FROM sphinx_a JOIN sphinx_t AS t USING(gid) ORDER BY t.id ASC;
-    sql_query_post_index = DELETE FROM sphinx_delta WHERE Time <= \
-        (SELECT id FROM sphinx_index_last_pos WHERE type = 'torrents')
+    sql_query_post_index = DELETE FROM sphinx_delta WHERE created <= \
+        (SELECT FROM_UNIXTIME(ID) FROM sphinx_index_last_pos WHERE type = 'torrents')
 }
 index torrents {
     source = torrents
@@ -365,8 +365,8 @@ source requests : requests_base {
         SELECT RequestID AS ID, UserID FROM requests_votes
     sql_attr_multi = uint Bookmarker from query; \
         SELECT RequestID AS ID, UserID FROM bookmarks_requests
-    sql_query_post_index = DELETE FROM sphinx_requests_delta WHERE TimeAdded <= \
-        (SELECT ID FROM sphinx_index_last_pos WHERE type = 'requests')
+    sql_query_post_index = DELETE FROM sphinx_requests_delta WHERE created <= \
+        (SELECT FROM_UNIXTIME(ID) FROM sphinx_index_last_pos WHERE type = 'requests')
 }
 source requests_delta : requests_base {
     sql_query = SELECT ID, UserID, TimeAdded, LastVote, CategoryID, Title, TagList, \

.docker/web/entrypoint.sh

@@ -7,6 +7,17 @@ run_service()
     service "$1" start || exit 1
 }
 
+if [ ! -e .docker-init-done ] ; then
+    .docker/web/generate-config.sh
+    composer --version
+    composer install --no-progress --optimize-autoloader
+    bin/local-patch
+    yarn
+    npx update-browserslist-db@latest
+    yarn dev
+    touch .docker-init-done
+fi
+
 while ! nc -z mysql 3306
 do
     echo "Waiting for MySQL..."

.gitignore

@@ -33,6 +33,7 @@ __MACOSX/
 /yarn-error.log
 
 .docker/mysql-home/.mysql_history
+.docker-init-done
 !.docker/mysql-home/.my.cnf
 
 /public/static/styles/**/*.css

.phpcs.xml

@@ -29,14 +29,15 @@
         <exclude name="PSR2.Classes.PropertyDeclaration.SpacingAfterType" />
         <exclude name="PSR2.Methods.FunctionCallSignature" />
 
-        <exclude name="PSR12.Classes.ClosingBrace" />
-        <exclude name="PSR12.ControlStructures.ControlStructureSpacing" />
         <exclude name="PSR12.Traits.UseDeclaration" />
 
         <exclude name="Squiz.Functions.FunctionDeclarationArgumentSpacing" />
         <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.BraceOnSameLine" />
+        <!-- function x() { return $x; } is ok -->
         <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.ContentAfterBrace" />
-        <exclude name="Squiz.WhiteSpace.ScopeClosingBrace" />
+        <exclude name="Squiz.WhiteSpace.ScopeClosingBrace.ContentBefore" />
+        <!-- <?php      } ?> is ok -->
+        <exclude name="Squiz.WhiteSpace.ScopeClosingBrace.Indent" />
     </rule>
 
     <rule ref="Generic.Arrays.DisallowLongArraySyntax" />

Dockerfile

@@ -1,9 +1,9 @@
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
-ENV DEB_RELEASE bullseye
-ENV DEBIAN_FRONTEND noninteractive
-ENV PHP_VER 8.2
-ENV NODE_VERSION 20
+ENV DEB_RELEASE=bookworm
+ENV DEBIAN_FRONTEND=noninteractive
+ENV PHP_VER=8.3
+ENV NODE_VERSION=20
 
 # Uncomment to skip the chromium download when installing puppeteer. If you do,
 # you'll need to launch puppeteer with:
@@ -31,7 +31,7 @@ RUN apt-get update \
         cron \
         make \
         nginx \
-        netcat \
+        netcat-openbsd \
         nodejs \
         php${PHP_VER}-cli \
         php${PHP_VER}-common \
@@ -98,10 +98,12 @@ RUN apt-get update \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
     # Python tools layer
-    && pip3 install chardet eac-logchecker xld-logchecker
+    && pip3 install --break-system-packages chardet eac-logchecker xld-logchecker
 
-COPY . /var/www
-COPY --from=composer:2.7.2 /usr/bin/composer /usr/local/bin/composer
+COPY .docker/ /var/www/.docker
+COPY lib /var/www/lib
+COPY bin/ /var/www/bin
+COPY --from=composer:2.7.7 /usr/bin/composer /usr/local/bin/composer
 
 # Permissions and configuration layer
 RUN useradd -ms /bin/bash gazelle \
@@ -116,19 +118,12 @@ RUN useradd -ms /bin/bash gazelle \
     && grep '^disable_functions' /etc/php/${PHP_VER}/cli/php.ini \
         | sed -r 's/pcntl_(fork|signal|signal_dispatch|waitpid),//g' \
         > /etc/php/${PHP_VER}/cli/conf.d/99-boris.ini \
-    && .docker/web/generate-config.sh \
     && echo "Generate file storage directories..." \
     && perl /var/www/bin/generate-storage-dirs /var/lib/gazelle/torrent 2 100 \
     && perl /var/www/bin/generate-storage-dirs /var/lib/gazelle/riplog 2 100 \
     && perl /var/www/bin/generate-storage-dirs /var/lib/gazelle/riploghtml 2 100 \
     && chown -R gazelle:gazelle /var/lib/gazelle /var/www \
-    && npm install -g npm@10.4.0 \
-    && su gazelle -c 'composer --version \
-       && composer install --no-progress --optimize-autoloader \
-       && bin/local-patch \
-       && yarn \
-       && npx update-browserslist-db@latest \
-       && yarn dev'
+    && npm install -g npm@10.8.2
 
 EXPOSE 80/tcp
 EXPOSE 3306/tcp

Makefile

@@ -19,6 +19,7 @@ help:
 	echo '  dump-torrent         - create a tarball of the rip logs'
 	echo '  git-submodules       - update the git submodules'
 	echo '  lint-css             - lint (style check) the CSS'
+	echo '  lint-js              - lint (style check) the Javascript'
 	echo '  lint-php             - lint (style check) the PHP'
 	echo '  lint-twig            - lint (style check) the Twig templates'
 	echo '  mysqldump            - dump mysql database from docker to misc/mysql-dump.sql'
@@ -70,6 +71,10 @@ lint-css:
 	yarn lint:css
 	yarn lint:css-checkstyle
 
+.PHONY: lint-js
+lint-js:
+	yarn run eslint -c misc/eslint.config.mjs public/static
+
 .PHONY: lint-php
 lint-php:
 	yarn lint:php:internal

README.md

@@ -39,8 +39,8 @@ In the root folder of the Gazelle repository, run the following command:
 
 `docker compose up -d`
 
-This will pull and build the needed images to run Gazelle on Debian
-Bullseye. A volume is mounted from the base of the git repository at
+This will pull and build the needed images to run Gazelle on Debian.
+A volume is mounted from the base of the git repository at
 `/var/www` in the container. Changes to the source code are
 immediately served without rebuilding or restarting.