Rx3/ampache-mga9
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Compare commits

base: Rx3:ampache-mga9-1.1.0
Branches Tags
Rx3:master
Rx3:ampache-mga9-1.2.1
Rx3:ampache-mga9-1.2.0
Rx3:ampache-mga9-1.1.1
Rx3:ampache-mga9-1.1.0
Rx3:ampache-mga9-1.0.0
...
compare: Rx3:master
Branches Tags
Rx3:master
Rx3:ampache-mga9-1.2.1
Rx3:ampache-mga9-1.2.0
Rx3:ampache-mga9-1.1.1
Rx3:ampache-mga9-1.1.0
Rx3:ampache-mga9-1.0.0

3 Commits
ampache-mg ... master

Author SHA1 Message Date
Arnaud G. GIBERT
a657d46d27 - 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.
 2024-08-28 18:01:42 +02:00
Arnaud G. GIBERT
10495dbfa5 - Switch to rx3/mariadb-mga9:1.0.0 image, 
- Now full Rx3 based!
 2024-08-27 23:43:01 +02:00
Arnaud G. GIBERT
d49d23a60a - Switch to rx3/php-apache-mga9:1.3.1 image, 
- Minor compose file update.
 2024-08-27 01:03:15 +02:00
5 changed files with 79 additions and 26 deletions
Show Stats Expand all files Collapse all files

10
.env
View File

@ -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.1.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>'
@ -27,3 +27,11 @@ IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# User Settings # 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"

37
Dockerfile
View File

@ -3,7 +3,7 @@
ARG IMG_URL_PREFIX="rx3" ARG IMG_URL_PREFIX="rx3"
FROM ${IMG_URL_PREFIX}/php-apache-mga9:1.3.0 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'
#--------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------
@ -35,19 +45,20 @@ RUN urpmi --force wget ffmpeg lib64opencl1 flac inotify-tools lame lib64avcodec5
&& 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 \
&& 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/ *$//' > /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 \
&& sed -i -e "s/post_max_size = 8M/post_max_size = 32M/" /etc/php.d/01_datahandling.ini && sed -i -e "s/post_max_size = 8M/post_max_size = 32M/" /etc/php.d/01_datahandling.ini
VOLUME ["/var/www/html/config"] VOLUME ["/var/www/html/config"]

3
ReadMe.txt
View File

@ -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/php-apache-mga9:1.3.2 & rx3/mariadb-mga9:1.0.1 images,
- Support mysql & external pwauth authentication.

29
ReleaseNotes.txt
View File

@ -1,3 +1,32 @@
------------------------------------------------------------------------------------------------------------------------------------
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 Rx3/Ampache-Mga9 V 1.1.0 - A. GIBERT - 2024/08/27
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------

26
compose.yaml
View File

@ -7,27 +7,31 @@ services:
database: database:
container_name: ${IMG_NAME}-mysql container_name: ${IMG_NAME}-mysql
image: mariadb:11.4.3-ubi9 image: ${IMG_URL_PREFIX}/mariadb-mga9:1.0.1
environment: 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: volumes:
- ./mysql:/var/lib/mysql - ./mysql:/var/lib/mysql
networks: networks:
- ampache - ampache
ports:
- "127.0.0.1:9006:9001"
- "127.0.0.1:8006:3306"
webapp-internal: webapp-internal:
container_name: ${IMG_NAME}-internal container_name: ${IMG_NAME}-internal
image: docker.xor.rx3:5000/rx3/${IMG_NAME}:${IMG_VERSION} image: ${IMG_URL}
build: build:
context: . context: .
@ -65,7 +69,7 @@ services:
webapp-external: webapp-external:
container_name: ${IMG_NAME}-external container_name: ${IMG_NAME}-external
image: docker.xor.rx3:5000/rx3/${IMG_NAME}:${IMG_VERSION} image: ${IMG_URL}
restart: unless-stopped restart: unless-stopped