diff --git a/Dockerfile b/Dockerfile index 7009ebb..56a21a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,13 +9,14 @@ ARG IMG_NAME ARG IMG_NAME_FULL ARG IMG_VERSION ARG IMG_MAINTAINER +ARG IMG_URL LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL} LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION} LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER} LABEL maintainer=${IMG_MAINTAINER} -ARG AMPACHE_VERSION=6.6.0 +ARG AMPACHE_VERSION=6.6.7 ENV DISABLE_INOTIFYWAIT_CLEAN=0 @@ -29,6 +30,8 @@ cp -f /var/tmp/ampache.cfg.php.dist /var/www/config chown -R apache:apache /var/www/config /var/log/ampache' #--------------------------------------------------------------------------------------------------- + + #--------------------------------------------------------------------------------------------------- ARG AMPACHE_CRON='# /etc/cron.d/ampache: crontab fragment for ampache server \n\ \n\ @@ -39,7 +42,8 @@ PATH=/bin:/usr/bin:/usr/local/bin:/usr/local/sbin -RUN urpmi.update -a \ +RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \ + && urpmi.update -a \ && urpmi --force wget ffmpeg lib64opencl1 flac inotify-tools lame lib64avcodec59 lib64event7 lib64mp3lame-devel lib64theora-devel lib64vorbis-devel lib64vpx-devel php-iconv php-curl php-gd php-intl php-ldap php-sabre-xml php-zip vorbis-tools zip unzip \ && mkdir -p /var/log/ampache \ && wget -q -O /tmp/ampache.zip https://github.com/ampache/ampache/releases/download/${AMPACHE_VERSION}/ampache-${AMPACHE_VERSION}_all_php8.2.zip \ @@ -58,6 +62,7 @@ RUN urpmi.update -a && ln -s /etc/init.d/ampache /etc/rcD.d/S40ampache + VOLUME ["/var/www/html/config"] VOLUME ["/var/log/ampache"] VOLUME ["/media"] diff --git a/ReadMe.txt b/ReadMe.txt index bc9d3af..73c44e2 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,8 +5,8 @@ Welcome to Rx3-Docker/Ampache docker image! 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.4-mga9 & rx3-docker/mariadb:1.1.3 images, + - Using Ampache V 6.6.7, + - Based on rx3-docker/php-apache:1.6.2-mga9 & rx3-docker/mariadb:1.1.5 images, - Support mysql & external pwauth authentication. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 379582f..937f123 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,13 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/Ampache V 1.3.5 - A. GIBERT - 2026/02/16 +------------------------------------------------------------------------------------------------------------------------------------ + +- Add ISL support, +- Use now rx3-docker/php-apache:1.6.2-mga9 & rx3-docker/mariadb-1.1.5-mga9 images, +- Rebuild for updates. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/Ampache V 1.3.4 - A. GIBERT - 2025/12/02 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index 089fe1c..d00e637 100644 --- a/compose.yaml +++ b/compose.yaml @@ -57,6 +57,7 @@ services: IMG_NAME_FULL: ${WAI_IMG_NAME_FULL} IMG_VERSION: ${WAI_IMG_VERSION} IMG_MAINTAINER: ${APPL_MAINTAINER} + IMG_URL: ${WAI_IMG_URL} IMG_FROM_URL: ${WAI_IMG_FROM_URL} restart: unless-stopped diff --git a/env.dist b/env.dist index 054de76..a9039bf 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.4" +APPL_VERSION="1.3.5" 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.4-mga9 - - - mysql - 8006 3306 - - mysql mysql +docker_service_add DB database ${ORG_URL_PREFIX} mariadb - 1.1.5-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.6.0-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.6.2-mga9 - - 8085 80 - - apache apache docker_service_add WAE webapp-external ${ORG_URL_PREFIX} ampache - ${APPL_VERSION}-mga9 - - - - - 8086 80 - - apache apache