diff --git a/docker/Dockerfile b/docker/Dockerfile index 80545ca..0534dfc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -17,7 +17,7 @@ apt-get -y --no-install-recommends install \ wget rsyslog 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 mariadb-server-10.6 python3 python3-mysqldb ca-certificates curl && \ + libtre5 cron libmariadb-dev mariadb-client-core-10.6 python3 python3-mysqldb ca-certificates curl && \ wget https://repo.manticoresearch.com/manticore-repo.noarch.deb && \ dpkg -i manticore-repo.noarch.deb && \ rm -f manticore-repo.noarch.deb && \ @@ -28,6 +28,7 @@ sed -i 's/mail.[iwe].*//' /etc/rsyslog.conf && \ sed -i '/session required pam_loginuid.so/c\#session required pam_loginuid.so' /etc/pam.d/cron && \ dpkg -i ${PACKAGE} && \ + touch /etc/piler/MANTICORE && \ ln -sf /etc/piler/piler-nginx.conf /etc/nginx/sites-enabled && \ rm -f ${PACKAGE} /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/docker/docker-compose.yaml b/docker/docker-compose.yaml index 725d896..3c100d9 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -2,7 +2,8 @@ services: mysql: - image: mariadb:10.5 + image: mariadb:10.6 + container_name: mysql restart: unless-stopped cap_drop: - ALL @@ -26,6 +27,7 @@ - db_data:/var/lib/mysql memcached: + container_name: memcached image: memcached:latest restart: unless-stopped cap_drop: @@ -33,7 +35,8 @@ command: -m 64 piler: - image: sutoj/piler:1.4.1 + image: piler:1.4.1 + container_name: piler init: true environment: - MYSQL_DATABASE=piler diff --git a/docker/start.sh b/docker/start.sh index df8f0df..f79a273 100755 --- a/docker/start.sh +++ b/docker/start.sh @@ -170,7 +170,7 @@ start_services() { - service rsyslog start + rsyslogd service cron start service php8.1-fpm start service nginx start