(simatec) Piler 1.4.5
This commit is contained in:
parent
2bd411d779
commit
67da33c974
5 changed files with 14 additions and 14 deletions
|
@ -1,14 +1,14 @@
|
||||||
FROM ubuntu:24.04
|
FROM ubuntu:22.04
|
||||||
|
|
||||||
ARG PACKAGE
|
ARG PACKAGE
|
||||||
ARG TARGETARCH
|
ARG TARGETARCH
|
||||||
|
|
||||||
LABEL description="piler ubuntu noble image" \
|
LABEL description="piler ubuntu jammy image" \
|
||||||
maintainer="Janos SUTO, sj@acts.hu" \
|
maintainer="Janos SUTO, sj@acts.hu" \
|
||||||
package="${PACKAGE}"
|
package="${PACKAGE}"
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND="noninteractive" \
|
ENV DEBIAN_FRONTEND="noninteractive" \
|
||||||
DISTRO="noble" \
|
DISTRO="jammy" \
|
||||||
PILER_USER="piler" \
|
PILER_USER="piler" \
|
||||||
MYSQL_DATABASE="piler"
|
MYSQL_DATABASE="piler"
|
||||||
|
|
||||||
|
@ -17,9 +17,9 @@ COPY ${PACKAGE}_${TARGETARCH}.deb /
|
||||||
# hadolint ignore=DL3008
|
# hadolint ignore=DL3008
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get -y --no-install-recommends install \
|
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 \
|
wget openssl sysstat php8.1-cli php8.1-cgi php8.1-mysql php8.1-fpm php8.1-zip php8.1-ldap \
|
||||||
php8.3-gd php8.3-curl php8.3-xml php8.3-memcached catdoc unrtf poppler-utils nginx tnef sudo libzip4t64 \
|
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 python3 python3-mysqldb ca-certificates curl rsyslog gnupg && \
|
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 && \
|
wget https://repo.manticoresearch.com/manticore-repo.noarch.deb && \
|
||||||
dpkg -i manticore-repo.noarch.deb && \
|
dpkg -i manticore-repo.noarch.deb && \
|
||||||
rm -f manticore-repo.noarch.deb && \
|
rm -f manticore-repo.noarch.deb && \
|
||||||
|
@ -31,7 +31,6 @@ RUN apt-get update && \
|
||||||
dpkg -i ${PACKAGE}_${TARGETARCH}.deb && \
|
dpkg -i ${PACKAGE}_${TARGETARCH}.deb && \
|
||||||
touch /etc/piler/MANTICORE && \
|
touch /etc/piler/MANTICORE && \
|
||||||
ln -sf /etc/piler/piler-nginx.conf /etc/nginx/sites-enabled && \
|
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 && \
|
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
|
crontab -u $PILER_USER /usr/share/piler/piler.cron
|
||||||
|
|
||||||
|
|
|
@ -14,8 +14,6 @@ SPHINX_CONF="${CONFIG_DIR}/manticore.conf"
|
||||||
CONFIG_SITE_PHP="${CONFIG_DIR}/config-site.php"
|
CONFIG_SITE_PHP="${CONFIG_DIR}/config-site.php"
|
||||||
PILER_MY_CNF="${CONFIG_DIR}/.my.cnf"
|
PILER_MY_CNF="${CONFIG_DIR}/.my.cnf"
|
||||||
RT="${RT:-0}"
|
RT="${RT:-0}"
|
||||||
MEMCACHED_HOSTNAME="${MEMCACHED_HOSTNAME:-memcached}"
|
|
||||||
|
|
||||||
|
|
||||||
error() {
|
error() {
|
||||||
echo "ERROR:" "$*" 1>&2
|
echo "ERROR:" "$*" 1>&2
|
||||||
|
@ -119,7 +117,7 @@ fix_configs() {
|
||||||
echo "\$config['DB_USERNAME'] = '$MYSQL_USER';"
|
echo "\$config['DB_USERNAME'] = '$MYSQL_USER';"
|
||||||
echo "\$config['DB_PASSWORD'] = '$MYSQL_PASSWORD';"
|
echo "\$config['DB_PASSWORD'] = '$MYSQL_PASSWORD';"
|
||||||
echo "\$config['ENABLE_MEMCACHED'] = 1;"
|
echo "\$config['ENABLE_MEMCACHED'] = 1;"
|
||||||
echo "\$memcached_server = ['$MEMCACHED_HOSTNAME', 11211];"
|
echo "\$memcached_server = ['memcached', 11211];"
|
||||||
} >> "$CONFIG_SITE_PHP"
|
} >> "$CONFIG_SITE_PHP"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -188,9 +186,8 @@ create_my_cnf_files() {
|
||||||
|
|
||||||
start_services() {
|
start_services() {
|
||||||
service cron start
|
service cron start
|
||||||
service php8.3-fpm start
|
service php8.1-fpm start
|
||||||
service nginx start
|
service nginx start
|
||||||
rm -f /run/rsyslogd.pid
|
|
||||||
rsyslogd
|
rsyslogd
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,7 @@ services:
|
||||||
- MYSQL_PASSWORD=${MYSQL_PASSWORD}
|
- MYSQL_PASSWORD=${MYSQL_PASSWORD}
|
||||||
- MYSQL_RANDOM_ROOT_PASSWORD=yes
|
- MYSQL_RANDOM_ROOT_PASSWORD=yes
|
||||||
- TZ="Europe/Berlin"
|
- TZ="Europe/Berlin"
|
||||||
|
- MARIADB_AUTO_UPGRADE=TRUE
|
||||||
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
|
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: mysql --user=${MYSQL_USER} --password=${MYSQL_PASSWORD} piler --execute "show tables"
|
test: mysql --user=${MYSQL_USER} --password=${MYSQL_PASSWORD} piler --execute "show tables"
|
||||||
|
@ -31,6 +32,8 @@ services:
|
||||||
image: memcached:latest
|
image: memcached:latest
|
||||||
container_name: memcached
|
container_name: memcached
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
cap_drop:
|
||||||
|
- ALL
|
||||||
command: -m 64
|
command: -m 64
|
||||||
|
|
||||||
piler:
|
piler:
|
||||||
|
|
|
@ -38,6 +38,7 @@ services:
|
||||||
- MYSQL_PASSWORD=${MYSQL_PASSWORD}
|
- MYSQL_PASSWORD=${MYSQL_PASSWORD}
|
||||||
- MYSQL_RANDOM_ROOT_PASSWORD=yes
|
- MYSQL_RANDOM_ROOT_PASSWORD=yes
|
||||||
- TZ="Europe/Berlin"
|
- TZ="Europe/Berlin"
|
||||||
|
- MARIADB_AUTO_UPGRADE=TRUE
|
||||||
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
|
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: mysql --user=${MYSQL_USER} --password=${MYSQL_PASSWORD} piler --execute "show tables"
|
test: mysql --user=${MYSQL_USER} --password=${MYSQL_PASSWORD} piler --execute "show tables"
|
||||||
|
|
|
@ -67,8 +67,8 @@ MAILCOW_HOST="mail.example.com"
|
||||||
|
|
||||||
# Piler Version
|
# Piler Version
|
||||||
|
|
||||||
PILER_VERSION="1.4.4"
|
PILER_VERSION="1.4.5"
|
||||||
|
|
||||||
# MariaDB Version
|
# MariaDB Version
|
||||||
|
|
||||||
MARIA_DB_VERSION="10.6"
|
MARIA_DB_VERSION="11.1.2"
|
||||||
|
|
Loading…
Reference in a new issue