- 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.
This commit is contained in:
parent
10495dbfa5
commit
a657d46d27
2
.env
2
.env
@ -18,7 +18,7 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
|
|||||||
|
|
||||||
IMG_NAME="ampache-mga9"
|
IMG_NAME="ampache-mga9"
|
||||||
IMG_FULL_NAME="Rx3 Ampache Mageia-9 Docker Image"
|
IMG_FULL_NAME="Rx3 Ampache Mageia-9 Docker Image"
|
||||||
IMG_VERSION="1.2.0"
|
IMG_VERSION="1.2.1"
|
||||||
IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
|
IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
|
||||||
IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
||||||
|
|
||||||
|
|||||||
17
Dockerfile
17
Dockerfile
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
ARG IMG_URL_PREFIX="rx3"
|
ARG IMG_URL_PREFIX="rx3"
|
||||||
|
|
||||||
FROM ${IMG_URL_PREFIX}/php-apache-mga9:1.3.1
|
FROM ${IMG_URL_PREFIX}/php-apache-mga9:1.3.2
|
||||||
|
|
||||||
ARG IMG_NAME
|
ARG IMG_NAME
|
||||||
ARG IMG_FULL_NAME
|
ARG IMG_FULL_NAME
|
||||||
@ -26,7 +26,17 @@ ARG AMPACHE='#!/bin/bash
|
|||||||
\n\
|
\n\
|
||||||
cp -f /var/www/config/ampache.cfg.php.dist /var/www/config \n\
|
cp -f /var/www/config/ampache.cfg.php.dist /var/www/config \n\
|
||||||
\n\
|
\n\
|
||||||
chown -R apache:apache /var/www/config /var/log/ampache'
|
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'
|
||||||
#---------------------------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
@ -36,6 +46,7 @@ RUN urpmi --force wget ffmpeg lib64opencl1 flac inotify-tools lame lib64avcodec5
|
|||||||
&& 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 \
|
||||||
|
&& sed -i -e 's/ || static::getUserRepository()->idByEmail($email) > 0//' /var/www/src/Repository/Model/User.php \
|
||||||
&& cp -f /var/www/public/rest/.htaccess.dist /var/www/public/rest/.htaccess \
|
&& 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/public/play/.htaccess.dist /var/www/public/play/.htaccess \
|
||||||
&& cp -f /var/www/config/ampache.cfg.php.dist /var/tmp \
|
&& cp -f /var/www/config/ampache.cfg.php.dist /var/tmp \
|
||||||
@ -43,7 +54,7 @@ RUN urpmi --force wget ffmpeg lib64opencl1 flac inotify-tools lame lib64avcodec5
|
|||||||
&& find /var/www -type d -name ".git*" -print0 | xargs -0 rm -rf {} \
|
&& find /var/www -type d -name ".git*" -print0 | xargs -0 rm -rf {} \
|
||||||
&& chown -R root:root /var/www \
|
&& chown -R root:root /var/www \
|
||||||
&& chmod -R 775 /var/www \
|
&& chmod -R 775 /var/www \
|
||||||
&& echo -e '${AMPACHE}' | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/ampache \
|
&& echo -e "${AMPACHE}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/ampache \
|
||||||
&& chmod a+x /etc/init.d/ampache \
|
&& chmod a+x /etc/init.d/ampache \
|
||||||
&& ln -s /etc/init.d/ampache /etc/rcD.d/S40ampache \
|
&& 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/upload_max_filesize = 16M/upload_max_filesize = 32M/" /etc/php.d/01_fileuploads.ini \
|
||||||
|
|||||||
@ -5,7 +5,8 @@ Welcome to Rx3/Ampache-Mga9 docker image!
|
|||||||
This is project aims to build a Ampache + Mageia 9 docker image.
|
This is project aims to build a Ampache + Mageia 9 docker image.
|
||||||
|
|
||||||
Features:
|
Features:
|
||||||
- Based on rx3/mariadb-mga9:1.0.0
|
- Based on rx3/php-apache-mga9:1.3.2 & rx3/mariadb-mga9:1.0.1 images,
|
||||||
|
- Support mysql & external pwauth authentication.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,3 +1,14 @@
|
|||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
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
|
Rx3/Ampache-Mga9 V 1.2.0 - A. GIBERT - 2024/08/27
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|||||||
@ -7,7 +7,7 @@ services:
|
|||||||
database:
|
database:
|
||||||
container_name: ${IMG_NAME}-mysql
|
container_name: ${IMG_NAME}-mysql
|
||||||
|
|
||||||
image: ${IMG_URL_PREFIX}/mariadb-mga9:1.0.0
|
image: ${IMG_URL_PREFIX}/mariadb-mga9:1.0.1
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
MARIADB_UID: ${MARIADB_UID}
|
MARIADB_UID: ${MARIADB_UID}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user