From 67da33c974ae3e81051b22c32cbe19cffe6c476a Mon Sep 17 00:00:00 2001
From: simatec <nais@gmx.net>
Date: Sun, 2 Jun 2024 23:30:25 +0200
Subject: [PATCH] (simatec) Piler 1.4.5

---
 build/Dockerfile         | 13 ++++++-------
 build/start.sh           |  7 ++-----
 config/piler-default.yml |  3 +++
 config/piler-ssl.yml     |  1 +
 piler.conf.example       |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/build/Dockerfile b/build/Dockerfile
index f75e517..116f2bc 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:24.04
+FROM ubuntu:22.04
 
 ARG PACKAGE
 ARG TARGETARCH
 
-LABEL description="piler ubuntu noble image" \
+LABEL description="piler ubuntu jammy image" \
       maintainer="Janos SUTO, sj@acts.hu" \
       package="${PACKAGE}"
 
 ENV DEBIAN_FRONTEND="noninteractive" \
-    DISTRO="noble" \
+    DISTRO="jammy" \
     PILER_USER="piler" \
     MYSQL_DATABASE="piler"
 
@@ -17,9 +17,9 @@ COPY ${PACKAGE}_${TARGETARCH}.deb /
 # hadolint ignore=DL3008
 RUN apt-get update && \
     apt-get -y --no-install-recommends install \
-       wget openssl sysstat php8.3-cli php8.3-cgi php8.3-mysql php8.3-fpm php8.3-zip php8.3-ldap \
-       php8.3-gd php8.3-curl php8.3-xml php8.3-memcached catdoc unrtf poppler-utils nginx tnef sudo libzip4t64 \
-       libtre5 cron libmariadb-dev mariadb-client-core python3 python3-mysqldb ca-certificates curl rsyslog gnupg && \
+       wget openssl sysstat php8.1-cli php8.1-cgi php8.1-mysql php8.1-fpm php8.1-zip php8.1-ldap \
+       php8.1-gd php8.1-curl php8.1-xml php8.1-memcached catdoc unrtf poppler-utils nginx tnef sudo libzip4 \
+       libtre5 cron libmariadb-dev mariadb-client-core-10.6 python3 python3-mysqldb ca-certificates curl rsyslog && \
     wget https://repo.manticoresearch.com/manticore-repo.noarch.deb && \
     dpkg -i manticore-repo.noarch.deb && \
     rm -f manticore-repo.noarch.deb && \
@@ -31,7 +31,6 @@ RUN apt-get update && \
     dpkg -i ${PACKAGE}_${TARGETARCH}.deb && \
     touch /etc/piler/MANTICORE && \
     ln -sf /etc/piler/piler-nginx.conf /etc/nginx/sites-enabled && \
-    echo "www-data ALL=NOPASSWD: /etc/init.d/rc.piler reload" > /etc/sudoers.d/piler && \
     rm -f ${PACKAGE}_${TARGETARCH}.deb /etc/nginx/sites-enabled/default /etc/piler/piler.key /etc/piler/piler.pem /etc/piler/config-site.php && \
     crontab -u $PILER_USER /usr/share/piler/piler.cron
 
diff --git a/build/start.sh b/build/start.sh
index 9a4ec4a..f02bc26 100644
--- a/build/start.sh
+++ b/build/start.sh
@@ -14,8 +14,6 @@ SPHINX_CONF="${CONFIG_DIR}/manticore.conf"
 CONFIG_SITE_PHP="${CONFIG_DIR}/config-site.php"
 PILER_MY_CNF="${CONFIG_DIR}/.my.cnf"
 RT="${RT:-0}"
-MEMCACHED_HOSTNAME="${MEMCACHED_HOSTNAME:-memcached}"
-
 
 error() {
    echo "ERROR:" "$*" 1>&2
@@ -119,7 +117,7 @@ fix_configs() {
          echo "\$config['DB_USERNAME'] = '$MYSQL_USER';"
          echo "\$config['DB_PASSWORD'] = '$MYSQL_PASSWORD';"
          echo "\$config['ENABLE_MEMCACHED'] = 1;"
-         echo "\$memcached_server = ['$MEMCACHED_HOSTNAME', 11211];"
+         echo "\$memcached_server = ['memcached', 11211];"
       } >> "$CONFIG_SITE_PHP"
    fi
 
@@ -188,9 +186,8 @@ create_my_cnf_files() {
 
 start_services() {
    service cron start
-   service php8.3-fpm start
+   service php8.1-fpm start
    service nginx start
-   rm -f /run/rsyslogd.pid
    rsyslogd
 }
 
diff --git a/config/piler-default.yml b/config/piler-default.yml
index 1fba800..7c50a04 100644
--- a/config/piler-default.yml
+++ b/config/piler-default.yml
@@ -17,6 +17,7 @@ services:
       - MYSQL_PASSWORD=${MYSQL_PASSWORD}
       - MYSQL_RANDOM_ROOT_PASSWORD=yes
       - TZ="Europe/Berlin"
+      - MARIADB_AUTO_UPGRADE=TRUE
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     healthcheck:
       test: mysql --user=${MYSQL_USER} --password=${MYSQL_PASSWORD} piler --execute "show tables"
@@ -31,6 +32,8 @@ services:
     image: memcached:latest
     container_name: memcached
     restart: unless-stopped
+    cap_drop:
+      - ALL
     command: -m 64
 
   piler:
diff --git a/config/piler-ssl.yml b/config/piler-ssl.yml
index 26fb30d..4151d1f 100644
--- a/config/piler-ssl.yml
+++ b/config/piler-ssl.yml
@@ -38,6 +38,7 @@ services:
       - MYSQL_PASSWORD=${MYSQL_PASSWORD}
       - MYSQL_RANDOM_ROOT_PASSWORD=yes
       - TZ="Europe/Berlin"
+      - MARIADB_AUTO_UPGRADE=TRUE
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     healthcheck:
       test: mysql --user=${MYSQL_USER} --password=${MYSQL_PASSWORD} piler --execute "show tables"
diff --git a/piler.conf.example b/piler.conf.example
index ae98437..1155475 100644
--- a/piler.conf.example
+++ b/piler.conf.example
@@ -67,8 +67,8 @@ MAILCOW_HOST="mail.example.com"
 
 # Piler Version
 
-PILER_VERSION="1.4.4"
+PILER_VERSION="1.4.5"
 
 # MariaDB Version
 
-MARIA_DB_VERSION="10.6"
+MARIA_DB_VERSION="11.1.2"