From b7ba76ef534cd291925c5c010c75198f34c90995 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Tue, 27 Aug 2024 00:04:39 +0200 Subject: [PATCH] - Switch to rx3/php-apache-mga9:1.3.0 image, - Configure php.ini, - Update compose & Dockerfile. --- .env | 24 +++++++++++++++++- Dockerfile | 63 +++++++++++++++++++++++------------------------- ReadMe.txt | 4 ++- ReleaseNotes.txt | 12 ++++++++- compose.yaml | 3 +++ 5 files changed, 70 insertions(+), 36 deletions(-) diff --git a/.env b/.env index b2c26c6..495062c 100644 --- a/.env +++ b/.env @@ -1,7 +1,29 @@ # 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.1.0" +IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}" IMG_MAINTAINER='"Arnaud G. GIBERT" ' + + + +#------------------------------------------------------------------------------- +# User Settings +#------------------------------------------------------------------------------- diff --git a/Dockerfile b/Dockerfile index 0ed6861..9dbaa73 100644 --- a/Dockerfile +++ b/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.0 ARG IMG_NAME ARG IMG_FULL_NAME @@ -18,20 +20,34 @@ 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' +#--------------------------------------------------------------------------------------------------- + + + 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 \ - && 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 \ - && 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 \ - && cp -f /var/www/public/play/.htaccess.dist /var/www/public/play/.htaccess \ - && cp -f /var/www/config/ampache.cfg.php.dist /var/tmp \ - && 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 \ - && find /var/www -type d -name ".git*" -print0 | xargs -0 rm -rf {} \ - && chown -R root:root /var/www \ - && chmod -R 775 /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 a+x /usr/local/sbin/ampache_init + && 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 \ + && 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 \ + && cp -f /var/www/public/play/.htaccess.dist /var/www/public/play/.htaccess \ + && cp -f /var/www/config/ampache.cfg.php.dist /var/tmp \ + && 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 \ + && find /var/www -type d -name ".git*" -print0 | xargs -0 rm -rf {} \ + && chown -R root:root /var/www \ + && chmod -R 775 /var/www \ + && echo -e '${AMPACHE}' | sed -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 +56,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"] - diff --git a/ReadMe.txt b/ReadMe.txt index 03067d3..3cf02d7 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -1,4 +1,4 @@ -Welcome to ampache-mga9 docker image! +Welcome to Rx3/Ampache-Mga9 docker image! @@ -7,6 +7,8 @@ This is project aims to build a Ampache + Mageia 9 docker image. Features: - ... + + Enjoy it! Your Rx3 Team. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 6a9cd0b..8f957d1 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,5 +1,15 @@ ------------------------------------------------------------------------------------------------------------------------------------ -PHP-Apache-Mga9 V 1.0.0 - A. GIBERT - 2024/08/25 +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, diff --git a/compose.yaml b/compose.yaml index 6a7a404..0c51503 100644 --- a/compose.yaml +++ b/compose.yaml @@ -36,6 +36,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,6 +59,7 @@ services: networks: - ampache ports: + - "127.0.0.1:9085:9001" - "127.0.0.1:8085:80" webapp-external: @@ -84,6 +86,7 @@ services: networks: - ampache ports: + - "127.0.0.1:9086:9001" - "127.0.0.1:8086:80" networks: