From d8ce97ca3d2cb08368721c44ae7317fef9e203ce Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Fri, 19 Sep 2025 21:22:39 +0200 Subject: [PATCH] - Add ampache log purge crontab, - Use now rx3-docker/php-apache:1.5.4-mga9 & rx3-docker/mariadb-1.1.3-mga9 images, - Rebuild for updates. --- ReadMe.txt | 2 +- ReleaseNotes.txt | 10 ++++++++++ compose.yaml | 3 ++- env.dist | 6 +++--- etc/cron.d-webapp-external/ampache | 6 ++++++ etc/{cron.d => cron.d-webapp-internal}/ampache | 1 + 6 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 etc/cron.d-webapp-external/ampache rename etc/{cron.d => cron.d-webapp-internal}/ampache (68%) diff --git a/ReadMe.txt b/ReadMe.txt index c581e7d..bc9d3af 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -6,7 +6,7 @@ This is project aims to build an Ampache docker image. Features: - Using Ampache V 6.6.0, - - Based on rx3-docker/php-apache:1.5.3-mga9 & rx3-docker/mariadb:1.1.2 images, + - Based on rx3-docker/php-apache:1.5.4-mga9 & rx3-docker/mariadb:1.1.3 images, - Support mysql & external pwauth authentication. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 5236195..f6ff258 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,13 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/Ampache V 1.3.3 - A. GIBERT - 2025/09/19 +------------------------------------------------------------------------------------------------------------------------------------ + +- Add ampache log purge crontab, +- Use now rx3-docker/php-apache:1.5.4-mga9 & rx3-docker/mariadb-1.1.3-mga9 images, +- Rebuild for updates. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/Ampache V 1.3.2 - A. GIBERT - 2025/04/21 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index cca7bd3..089fe1c 100644 --- a/compose.yaml +++ b/compose.yaml @@ -78,7 +78,7 @@ services: - ./${WAI_LOG_MAIN_EXT}:${WAI_LOG_MAIN_INT} - ./etc/ampache-webapp-internal:/var/www/config - - ./etc/cron.d/ampache:/etc/cron.d/ampache:ro + - ./etc/cron.d-webapp-internal/ampache:/etc/cron.d/ampache:ro - /etc/passwd:/etc/passwd:ro - /etc/group:/etc/group:ro - /etc/shadow:/etc/shadow:ro @@ -121,6 +121,7 @@ services: - ./${WAE_LOG_MAIN_EXT}:${WAE_LOG_MAIN_INT} - ./etc/ampache-webapp-external:/var/www/config + - ./etc/cron.d-webapp-external/ampache:/etc/cron.d/ampache:ro - /etc/passwd:/etc/passwd:ro - /etc/group:/etc/group:ro diff --git a/env.dist b/env.dist index 5f0e48c..5518ddb 100644 --- a/env.dist +++ b/env.dist @@ -20,7 +20,7 @@ APPL_NAME="ampache" APPL_NAME_FULL="Ampache" APPL_NAME_SHORT="ampache" APPL_ORG="rx3-docker" -APPL_VERSION="1.3.2" +APPL_VERSION="1.3.3" APPL_MAINTAINER='"Arnaud G. GIBERT" ' @@ -76,9 +76,9 @@ DOCKER_TOOLS_VOLUME=MERGED # | Prefix | Name | URL Prefix | Name | Name Full | Version | URL Prefix | Name | Version | Name | Version | Ext | Int | Ext | Int | Name / Id | Name / Id | #------------------+----------+--------------------------+--------------------+------------------+-------------------------------+----------------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+ -docker_service_add DB database ${ORG_URL_PREFIX} mariadb - 1.1.2-mga9 - - - mysql - 8006 3306 - - mysql mysql +docker_service_add DB database ${ORG_URL_PREFIX} mariadb - 1.1.3-mga9 - - - mysql - 8006 3306 - - mysql mysql -docker_service_add WAI webapp-internal ${ORG_URL_PREFIX} ampache "Rx3-Docker/Ampache" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} php-apache 1.5.3-mga9 - - 8085 80 - - apache apache +docker_service_add WAI webapp-internal ${ORG_URL_PREFIX} ampache "Rx3-Docker/Ampache" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} php-apache 1.5.4-mga9 - - 8085 80 - - apache apache docker_service_add WAE webapp-external ${ORG_URL_PREFIX} ampache - ${APPL_VERSION}-mga9 - - - - - 8086 80 - - apache apache diff --git a/etc/cron.d-webapp-external/ampache b/etc/cron.d-webapp-external/ampache new file mode 100644 index 0000000..69ebac9 --- /dev/null +++ b/etc/cron.d-webapp-external/ampache @@ -0,0 +1,6 @@ +# /etc/cron.d/ampache: crontab fragment for ampache server + +PATH=/bin:/usr/bin:/usr/local/bin:/usr/local/sbin + +#15 3 * * * apache cd /var/www; php bin/cli run:updateCatalog -v -c -e -a -g >/var/log/ampache/catalog_update.log 2>&1 +0 3 * * * apache find /var/log/ampache/ -type f -name "ampache*.log" -mtime +30 -delete diff --git a/etc/cron.d/ampache b/etc/cron.d-webapp-internal/ampache similarity index 68% rename from etc/cron.d/ampache rename to etc/cron.d-webapp-internal/ampache index 3ae09d5..a181e05 100644 --- a/etc/cron.d/ampache +++ b/etc/cron.d-webapp-internal/ampache @@ -3,3 +3,4 @@ PATH=/bin:/usr/bin:/usr/local/bin:/usr/local/sbin 15 3 * * * apache cd /var/www; php bin/cli run:updateCatalog -v -c -e -a -g >/var/log/ampache/catalog_update.log 2>&1 +0 3 * * * apache find /var/log/ampache/ -type f -name "ampache*.log" -mtime +30 -delete