diff --git a/.gitignore b/.gitignore index dc40f78..a2f7d94 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .git .vscode .DS_Store -piler.conf \ No newline at end of file +piler.conf +build/piler* \ No newline at end of file diff --git a/LICENSE b/LICENSE index bfb7c26..3199232 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 - 2023 simatec +Copyright (c) 2022 - 2023 simatec and Servercow Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index bf2d348..2f5b1c0 100644 --- a/README.md +++ b/README.md @@ -1,34 +1,6 @@ # piler-docker -[![License](https://img.shields.io/github/license/simatec/piler-docker?style=flat)](https://github.com/simatec/piler-docker/blob/master/LICENSE) -[![Donate](https://img.shields.io/badge/paypal-donate%20|%20spenden-blue.svg)](https://paypal.me/mk1676) - - -************************************************************************************************************** - -**If you like it, please consider a donation:** - -[![paypal](https://www.paypalobjects.com/en_US/DK/i/btn/btn_donateCC_LG.gif)](https://paypal.me/mk1676) - -************************************************************************************************************** - - -### Mailpiler for Docker - -This is a project to get the Mailpiler running in a docker compose system in a simple and uncomplicated way. - -You can find more information about the Piler project here. - -https://www.mailpiler.org/ or https://github.com/jsuto/piler - -******************************************************************************************************* - -### DockerHub - -https://hub.docker.com/r/simatec/piler - -******************************************************************************************************* - +Originated from: https://github.com/simatec/piler-docker ### Installation Guide: diff --git a/build/Dockerfile b/build/Dockerfile index 116f2bc..98086fb 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,25 +1,25 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 ARG PACKAGE ARG TARGETARCH -LABEL description="piler ubuntu jammy image" \ +LABEL description="piler ubuntu noble image" \ maintainer="Janos SUTO, sj@acts.hu" \ package="${PACKAGE}" ENV DEBIAN_FRONTEND="noninteractive" \ - DISTRO="jammy" \ + DISTRO="noble" \ PILER_USER="piler" \ MYSQL_DATABASE="piler" -COPY ${PACKAGE}_${TARGETARCH}.deb / +COPY ${PACKAGE} / # hadolint ignore=DL3008 RUN apt-get update && \ apt-get -y --no-install-recommends install \ - 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 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 libzip4 \ + libtre5 cron libmariadb-dev mariadb-client-core python3 python3-mysqldb ca-certificates curl rsyslog gnupg && \ wget https://repo.manticoresearch.com/manticore-repo.noarch.deb && \ dpkg -i manticore-repo.noarch.deb && \ rm -f manticore-repo.noarch.deb && \ @@ -28,10 +28,10 @@ RUN apt-get update && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \ sed -i '/session required pam_loginuid.so/c\#session required pam_loginuid.so' /etc/pam.d/cron && \ - dpkg -i ${PACKAGE}_${TARGETARCH}.deb && \ + dpkg -i ${PACKAGE} && \ touch /etc/piler/MANTICORE && \ ln -sf /etc/piler/piler-nginx.conf /etc/nginx/sites-enabled && \ - 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}.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 VOLUME ["/etc/piler","/var/piler/store","/var/piler/manticore","/var/piler/imap","/var/piler/stat","/var/spool/cron/crontabs"] diff --git a/build/build.conf b/build/build.conf index ccef72f..1fe0497 100644 --- a/build/build.conf +++ b/build/build.conf @@ -1,10 +1,10 @@ # Piler Package -PILER_PACKAGE="piler_1.4.5-jammy-c13432f_amd64.deb" +PILER_PACKAGE="piler_1.4.7-noble-874c0a6_amd64.deb" # Piler Version -PILER_VERSION="1.4.5" +PILER_VERSION="1.4.7" # MariaDB Version diff --git a/build/build.sh b/build/build.sh index 3d9de5e..f9c6db9 100644 --- a/build/build.sh +++ b/build/build.sh @@ -22,13 +22,13 @@ chmod a+x start.sh rm -f $buildPth/*.deb #curl -OL https://bitbucket.org/jsuto/piler/downloads/$PILER_PACKAGE -wget https://bitbucket.org/jsuto/piler/downloads/$PILER_PACKAGE -O $PILER_PACKAGE +wget https://github.com/jsuto/piler/releases/download/piler-$PILER_VERSION/$PILER_PACKAGE -O $PILER_PACKAGE set -o errexit set -o pipefail set -o nounset -IMAGE_NAME="simatec/piler:$PILER_VERSION" +IMAGE_NAME="servercow/piler:$PILER_VERSION" if [ ! -f $buildPth/$PILER_PACKAGE ]; then echo "ERROR: missing package name" 1>&2; exit 1; diff --git a/build/start.sh b/build/start.sh old mode 100644 new mode 100755 diff --git a/install-piler.sh b/install-piler.sh index 48ddb5c..7d24439 100644 --- a/install-piler.sh +++ b/install-piler.sh @@ -196,9 +196,9 @@ if [ ! -f $installPth/.configDone ]; then sed -i 's/LETSENCRYPT_EMAIL=.*/LETSENCRYPT_EMAIL="'$acmeContact'"/g' ./piler.conf fi - # use Mailcow + # use mailcow while true; do - read -ep "If Use Mailcow API Options (yes/no)? / Y|N: " jn + read -ep "If Use mailcow API Options (yes/no)? / Y|N: " jn case $jn in [Yy]* ) sed -i 's/USE_MAILCOW=.*/USE_MAILCOW=true/g' ./piler.conf; break;; [Nn]* ) sed -i 's/USE_MAILCOW=.*/USE_MAILCOW=false/g' ./piler.conf; break;; @@ -210,13 +210,13 @@ if [ ! -f $installPth/.configDone ]; then . ./piler.conf if [ "$USE_MAILCOW" = true ]; then - # Mailcow API-Key - read -ep "Please set your Mailcow API-Key (current: $MAILCOW_APIKEY): " apiKey + # mailcow API-Key + read -ep "Please set your mailcow API-Key (current: $MAILCOW_APIKEY): " apiKey apiKey=${apiKey:=$MAILCOW_APIKEY} sed -i 's/MAILCOW_APIKEY=.*/MAILCOW_APIKEY="'$apiKey'"/g' ./piler.conf - # Mailcow Host Domain - read -ep "Please set your Mailcow Host Domain (Enter for default: $imapServer): " mailcowHost + # mailcow Host Domain + read -ep "Please set your mailcow Host Domain (Enter for default: $imapServer): " mailcowHost mailcowHost=${mailcowHost:=$imapServer} sed -i 's/MAILCOW_HOST=.*/MAILCOW_HOST="'$mailcowHost'"/g' ./piler.conf fi @@ -418,31 +418,6 @@ cat >> $etcPth/config-site.php <> $etcPth/config-site.php <> $configSite <> $configSite <