From d7e918256e8d7cf370f5f574888c1d651f644d04 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Mon, 21 Apr 2025 20:22:03 +0200 Subject: [PATCH] - Use now rx3-docker/php-apache:1.5.3-mga9 & rx3-docker/mariadb-1.1.2-mga9 images. --- Dockerfile | 3 ++- ReadMe.txt | 2 +- ReleaseNotes.txt | 8 ++++++++ compose.yaml | 14 +++++++++++++- env.dist | 12 ++++++------ 5 files changed, 30 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index dbaf3ce..7009ebb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,8 @@ PATH=/bin:/usr/bin:/usr/local/bin:/usr/local/sbin -RUN 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 \ +RUN 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 \ && unzip /tmp/ampache.zip -d /var/www \ diff --git a/ReadMe.txt b/ReadMe.txt index df304f0..c581e7d 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.4.0-mga9 & rx3-docker/mariadb:1.1.0 images, + - Based on rx3-docker/php-apache:1.5.3-mga9 & rx3-docker/mariadb:1.1.2 images, - Support mysql & external pwauth authentication. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index eaaed57..5236195 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,11 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/Ampache V 1.3.2 - A. GIBERT - 2025/04/21 +------------------------------------------------------------------------------------------------------------------------------------ + +- Use now rx3-docker/php-apache:1.5.3-mga9 & rx3-docker/mariadb-1.1.2-mga9 images. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/Ampache V 1.3.1 - A. GIBERT - 2024/12/14 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index 83eaf5b..cca7bd3 100644 --- a/compose.yaml +++ b/compose.yaml @@ -39,6 +39,10 @@ services: ports: - "127.0.0.1:${DB_PORT_SV_EXT}:${DB_PORT_SV_INT}" - "127.0.0.1:${DB_PORT_MAIN_EXT}:${DB_PORT_MAIN_INT}" + + + +#------------------------------------------------------------------------------- webapp-internal: container_name: ${WAI_HOST_NAME} @@ -72,7 +76,7 @@ services: - ./${WAI_LOG_SV_EXT}:${WAI_LOG_SV_INT} - ./${WAI_LOG_HTTPD_EXT}:${WAI_LOG_HTTPD_INT} - ./${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/passwd:/etc/passwd:ro @@ -88,6 +92,10 @@ services: ports: - "127.0.0.1:${WAI_PORT_SV_EXT}:${WAI_PORT_SV_INT}" - "127.0.0.1:${WAI_PORT_MAIN_EXT}:${WAI_PORT_MAIN_INT}" + + + +#------------------------------------------------------------------------------- webapp-external: container_name: ${WAE_HOST_NAME} @@ -126,6 +134,10 @@ services: - "127.0.0.1:${WAE_PORT_SV_EXT}:${WAE_PORT_SV_INT}" - "127.0.0.1:${WAE_PORT_MAIN_EXT}:${WAE_PORT_MAIN_INT}" + + +#------------------------------------------------------------------------------- + networks: appl: name: ${NETWORK_NAME} diff --git a/env.dist b/env.dist index aca91a6..5f0e48c 100644 --- a/env.dist +++ b/env.dist @@ -1,4 +1,4 @@ -# Rx3 Ampache Mageia-9 Docker Image +# Rx3-Docker/Ampache Docker Image #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- @@ -20,7 +20,7 @@ APPL_NAME="ampache" APPL_NAME_FULL="Ampache" APPL_NAME_SHORT="ampache" APPL_ORG="rx3-docker" -APPL_VERSION="1.3.1" +APPL_VERSION="1.3.2" APPL_MAINTAINER='"Arnaud G. GIBERT" ' @@ -67,8 +67,8 @@ NETWORK_IF_NAME=br-${APPL_NAME_SHORT}-${APPL_ENV} DOCKER_TOOLS_DEBUG=FALSE DOCKER_TOOLS_VOLUME=MERGED -#DOCKER_TOOLS_EXECPTION_LIBS="postgres:pgsql" - +#DOCKER_TOOLS_EXEPTION_LIBS="postgres:pgsql" + #------------------+----------+--------------------------+--------------------+------------------+-------------------------------+----------------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+ @@ -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.0-mga9 - - - mysql - 8006 3306 - - postgres postgres +docker_service_add DB database ${ORG_URL_PREFIX} mariadb - 1.1.2-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.4.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.5.3-mga9 - - 8085 80 - - apache apache docker_service_add WAE webapp-external ${ORG_URL_PREFIX} ampache - ${APPL_VERSION}-mga9 - - - - - 8086 80 - - apache apache