diff --git a/docker/Dockerfile b/docker/Dockerfile index bd5dd15a..0e7e96f2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -15,7 +15,7 @@ COPY ${PACKAGE} / RUN apt-get update && \ 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 \ + 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 && \ wget https://repo.manticoresearch.com/manticore-repo.noarch.deb && \ @@ -25,7 +25,6 @@ RUN apt-get update && \ apt-get install -y manticore manticore-columnar-lib && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \ - 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 && \ diff --git a/docker/build.sh b/docker/build.sh index 9fd28ff6..58066e71 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -4,7 +4,7 @@ set -o errexit set -o pipefail set -o nounset -IMAGE_NAME="sutoj/piler:1.3.12" +IMAGE_NAME="sutoj/piler:1.4.4" if [[ $# -ne 1 ]]; then echo "ERROR: missing package name" 1>&2; exit 1; fi diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 0ff91680..61b57784 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -35,7 +35,7 @@ services: command: -m 64 piler: - image: sutoj/piler:1.4.2 + image: sutoj/piler:1.4.4 container_name: piler init: true environment: @@ -53,6 +53,7 @@ services: - piler_etc:/etc/piler - piler_var_store:/var/piler/store - piler_var_manticore:/var/piler/manticore + - /dev/log:/dev/log healthcheck: test: curl -s smtp://localhost/ interval: "60s" diff --git a/docker/start.sh b/docker/start.sh index cc7cb73c..e20b2faf 100755 --- a/docker/start.sh +++ b/docker/start.sh @@ -170,7 +170,6 @@ create_my_cnf_files() { start_services() { - rsyslogd service cron start service php8.1-fpm start service nginx start