- Switch to rx3/php-apache-mga9:1.3.2 image,

- Switch to rx3/mariadb-mga9:1.0.1 image,
- Fix /usr/bin/pwauth group & mode,
- Fix Ampache Repository/Model/User.php: remove email lookup for new user.

.env

@@ -1,7 +1,37 @@
 # Rx3 Ampache Mageia-9 Docker Image
 #-------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
+# Global Settings
+#-------------------------------------------------------------------------------
+
+IMG_ORG="rx3"
+IMG_REGISTRY="docker.xor.rx3:5000"
+IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
+
+
+
+#-------------------------------------------------------------------------------
+# Image Settings
+#-------------------------------------------------------------------------------
+
+
 IMG_NAME="ampache-mga9"
 IMG_FULL_NAME="Rx3 Ampache Mageia-9 Docker Image"
-IMG_VERSION="1.0.0"
+IMG_VERSION="1.2.1"
+IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
 IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
+
+
+
+#-------------------------------------------------------------------------------
+# User Settings
+#-------------------------------------------------------------------------------
+
+MARIADB_UID=983
+MARIADB_GID=981
+MARIADB_ROOT_HOST='%'  # needs to be enclosed with quotes
+MARIADB_ROOT_PASSWORD="mysqladmin"
+MARIADB_DATABASE="ampache"
+MARIADB_USER="ampache"
+MARIADB_PASSWORD="ampacheadmin"

Dockerfile

@@ -1,7 +1,9 @@
 #
 #-------------------------------------------------------------------------------
 
-FROM docker.xor.rx3:5000/rx3/php-apache-mga9:1.2.0
+ARG IMG_URL_PREFIX="rx3"
+
+FROM ${IMG_URL_PREFIX}/php-apache-mga9:1.3.2
 
 ARG IMG_NAME
 ARG IMG_FULL_NAME
@@ -18,20 +20,45 @@ LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
 LABEL maintainer=${IMG_MAINTAINER}
 
 
+
+#---------------------------------------------------------------------------------------------------
+ARG AMPACHE='#!/bin/bash                                                                         \n\
+                                                                                                 \n\
+cp -f /var/www/config/ampache.cfg.php.dist /var/www/config                                       \n\
+                                                                                                 \n\
+chown -R apache:apache /var/www/config /var/log/ampache                                          \n\
+chgrp           apache /usr/bin/pwauth                                                           \n\
+chmod    u+s           /usr/bin/pwauth'
+#---------------------------------------------------------------------------------------------------
+
+#---------------------------------------------------------------------------------------------------
+ARG AMPACHE_CRON='# /etc/cron.d/ampache: crontab fragment for ampache server                     \n\
+                                                                                                 \n\
+PATH=/bin:/usr/bin:/usr/local/bin:/usr/local/sbin                                                \n\
+                                                                                                 \n\
+15      3       *       *       *       apache    cd /var/www; php bin/cli run:updateCatalog -v -c -e -a -g >/var/log/ampache/catalog_update.log 2>&1'
+#---------------------------------------------------------------------------------------------------
+
+
+
 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 supervisor vorbis-tools zip unzip pwauth \
-    &&  mkdir -p /var/log/ampache \
+    && 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 \
+    && 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 \
+    && unzip /tmp/ampache.zip -d /var/www                                                                                                                                                \
-    &&  sed -i -e 's/$transcode_cfg != '"'"'never'"'"'/$transcode_cfg != '"'"'ever'"'"'/' /var/www/src/Module/Util/Waveform.php \
+    && sed   -i -e 's/$transcode_cfg != '"'"'never'"'"'/$transcode_cfg != '"'"'ever'"'"'/' /var/www/src/Module/Util/Waveform.php                                                         \
-    &&  cp -f /var/www/public/rest/.htaccess.dist  /var/www/public/rest/.htaccess \
+    && sed   -i -e 's/ || static::getUserRepository()->idByEmail($email) > 0//' /var/www/src/Repository/Model/User.php                                                                   \
-    &&  cp -f /var/www/public/play/.htaccess.dist  /var/www/public/play/.htaccess \
+    && cp    -f /var/www/public/rest/.htaccess.dist  /var/www/public/rest/.htaccess                                                                                                      \
-    &&  cp -f /var/www/config/ampache.cfg.php.dist /var/tmp \
+    && cp    -f /var/www/public/play/.htaccess.dist  /var/www/public/play/.htaccess                                                                                                      \
-    &&  rm -f /tmp/ampache.zip /var/www/public/.php*cs* /var/www/public/.sc /var/www/public/.scrutinizer.yml /var/www/public/.tgitconfig /var/www/public/.travis.yml /var/www/public/*.md \
+    && cp    -f /var/www/config/ampache.cfg.php.dist /var/tmp                                                                                                                            \
-    &&  find /var/www -type d -name ".git*" -print0 | xargs -0 rm -rf {} \
+    && rm    -f /tmp/ampache.zip /var/www/public/.php*cs* /var/www/public/.sc /var/www/public/.scrutinizer.yml /var/www/public/.tgitconfig /var/www/public/.travis.yml /var/www/public/*.md \
-    &&  chown -R root:root /var/www \
+    && find     /var/www -type d -name ".git*" -print0 | xargs -0 rm -rf {}                                                                                                              \
-    &&  chmod -R 775 /var/www \
+    && chown -R root:root /var/www                                                                                                                                                       \
-    &&  echo -e '#!/bin/bash\n\ncp -f /var/www/config/ampache.cfg.php.dist /var/www/config\nchown -R ${APACHE_UID}:${APACHE_GID} /var/www/config /var/log/ampache\n/usr/local/sbin/apache_init' > /usr/local/sbin/ampache_init \
+    && chmod -R 775 /var/www                                                                                                                                                             \
-    &&  chmod a+x /usr/local/sbin/ampache_init
+    && echo  -e "${AMPACHE}"      | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/ampache                                                                                                 \
+    && chmod  a+x /etc/init.d/ampache                                                                                                                                                    \
+    && ln    -s   /etc/init.d/ampache /etc/rcD.d/S40ampache                                                                                                                              \
+    && sed   -i -e "s/upload_max_filesize = 16M/upload_max_filesize = 32M/" /etc/php.d/01_fileuploads.ini                                                                                \
+    && sed   -i -e "s/post_max_size = 8M/post_max_size = 32M/"              /etc/php.d/01_datahandling.ini
 
 
 VOLUME ["/var/www/html/config"]
@@ -40,22 +67,3 @@ VOLUME ["/media"]
 
 
 EXPOSE 80
-
-ENTRYPOINT ["/usr/local/sbin/ampache_init"]
-
-
-
-#COPY data/bin/run.sh data/bin/inotifywait.sh data/bin/cron.sh data/bin/apache2.sh data/bin/mysql.sh data/bin/create_mysql_admin_user.sh data/bin/ampache_cron.sh data/bin/docker-entrypoint.sh /usr/local/bin/
-#COPY data/sites-enabled/001-ampache.conf /etc/apache2/sites-available/
-#COPY data/apache2/php.ini /etc/php/8.2/apache2/
-#COPY data/logrotate.d/* /etc/logrotate.d/
-#COPY data/supervisord/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-
-#RUN  chown -R www-data:www-data /var/tmp/ampache.cfg.php.dist /var/www/config \
-#    &&  chmod +x /usr/local/bin/*.sh
-
-#ENTRYPOINT ["docker-entrypoint.sh"]
-#CMD ["run.sh"]
-
-#ENTRYPOINT ["/bin/bash -c sleep 60m"]
-

ReadMe.txt

@@ -1,11 +1,14 @@
-Welcome to ampache-mga9 docker image!
+Welcome to Rx3/Ampache-Mga9 docker image!
 
 
 
 This is project aims to build a Ampache + Mageia 9 docker image.
 
 Features:
-    - ...
+    - Based on rx3/php-apache-mga9:1.3.2 & rx3/mariadb-mga9:1.0.1 images,
+    - Support mysql & external pwauth authentication.
+
+
 
 Enjoy it!
 

ReleaseNotes.txt

@@ -1,5 +1,44 @@
 ------------------------------------------------------------------------------------------------------------------------------------
-PHP-Apache-Mga9 V 1.0.0 - A. GIBERT - 2024/08/25
+Rx3/Ampache-Mga9 V 1.2.1 - A. GIBERT - 2024/08/28
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Switch to rx3/php-apache-mga9:1.3.2 image,
+- Switch to rx3/mariadb-mga9:1.0.1 image,
+- Fix /usr/bin/pwauth group & mode,
+- Fix Ampache Repository/Model/User.php: remove email lookup for new user.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/Ampache-Mga9 V 1.2.0 - A. GIBERT - 2024/08/27
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Switch to rx3/mariadb-mga9:1.0.0 image,
+- Now full Rx3 based!
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/Ampache-Mga9 V 1.1.1 - A. GIBERT - 2024/08/27
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Switch to rx3/php-apache-mga9:1.3.1 image,
+- Minor compose file update.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/Ampache-Mga9 V 1.1.0 - A. GIBERT - 2024/08/27
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Switch to rx3/php-apache-mga9:1.3.0 image,
+- Configure php.ini,
+- Update compose & Dockerfile.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/Ampache-Mga9 V 1.0.0 - A. GIBERT - 2024/08/25
 ------------------------------------------------------------------------------------------------------------------------------------
 
 - Initial release,

compose.yaml

@@ -7,27 +7,31 @@ services:
   database:
     container_name: ${IMG_NAME}-mysql
     
-    image: mariadb:11.4.3-ubi9
+    image: ${IMG_URL_PREFIX}/mariadb-mga9:1.0.1
     
     environment:
-      MARIADB_ROOT_PASSWORD: mysqladmin
+      MARIADB_UID:           ${MARIADB_UID}
-      MARIADB_DATABASE: ampache
+      MARIADB_GID:           ${MARIADB_GID}
-      MARIADB_USER: ampache
+      MARIADB_ROOT_HOST:     ${MARIADB_ROOT_HOST}
-      MARIADB_PASSWORD: ampacheadmin
+      MARIADB_ROOT_PASSWORD: ${MARIADB_ROOT_PASSWORD}
-      MARIADB_ROOT_HOST: '%'  # needs to be enclosed with quotes
+      MARIADB_DATABASE:      ${MARIADB_DATABASE}
-      
+      MARIADB_USER:          ${MARIADB_USER}
-    user: "983:981"
+      MARIADB_PASSWORD:      ${MARIADB_PASSWORD}
-    
+
     volumes:
       - ./mysql:/var/lib/mysql
       
     networks:
       - ampache
       
+    ports:
+      - "127.0.0.1:9006:9001"
+      - "127.0.0.1:8006:3306"
+      
   webapp-internal:
     container_name: ${IMG_NAME}-internal
     
-    image: docker.xor.rx3:5000/rx3/${IMG_NAME}:${IMG_VERSION}
+    image: ${IMG_URL}
 
     build:
       context: .
@@ -36,6 +40,7 @@ services:
         - IMG_FULL_NAME=${IMG_FULL_NAME}
         - IMG_VERSION=${IMG_VERSION}
         - IMG_MAINTAINER=${IMG_MAINTAINER}
+        - IMG_URL_PREFIX=${IMG_URL_PREFIX}
         
     restart: unless-stopped
     
@@ -58,12 +63,13 @@ services:
     networks:
       - ampache
     ports:
+      - "127.0.0.1:9085:9001"
       - "127.0.0.1:8085:80"
       
   webapp-external:
     container_name: ${IMG_NAME}-external
 
-    image: docker.xor.rx3:5000/rx3/${IMG_NAME}:${IMG_VERSION}
+    image: ${IMG_URL}
     
     restart: unless-stopped
     
@@ -84,6 +90,7 @@ services:
     networks:
       - ampache
     ports:   
+      - "127.0.0.1:9086:9001"
       - "127.0.0.1:8086:80"
 
 networks: