From 10495dbfa53fd2577526743d0d3f03a603eead7b Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Tue, 27 Aug 2024 23:43:01 +0200 Subject: [PATCH] - Switch to rx3/mariadb-mga9:1.0.0 image, - Now full Rx3 based! --- .env | 10 +++++++++- Dockerfile | 2 +- ReadMe.txt | 2 +- ReleaseNotes.txt | 9 +++++++++ compose.yaml | 22 +++++++++++++--------- 5 files changed, 33 insertions(+), 12 deletions(-) diff --git a/.env b/.env index 14bd3d2..2254ac8 100644 --- a/.env +++ b/.env @@ -18,7 +18,7 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}" IMG_NAME="ampache-mga9" IMG_FULL_NAME="Rx3 Ampache Mageia-9 Docker Image" -IMG_VERSION="1.1.1" +IMG_VERSION="1.2.0" IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}" IMG_MAINTAINER='"Arnaud G. GIBERT" ' @@ -27,3 +27,11 @@ IMG_MAINTAINER='"Arnaud G. GIBERT" ' #------------------------------------------------------------------------------- # 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" diff --git a/Dockerfile b/Dockerfile index 592cabc..7476026 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,7 +43,7 @@ RUN urpmi --force wget ffmpeg lib64opencl1 flac inotify-tools lame lib64avcodec5 && 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 \ + && 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 \ diff --git a/ReadMe.txt b/ReadMe.txt index 3cf02d7..b8a2914 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,7 +5,7 @@ Welcome to Rx3/Ampache-Mga9 docker image! This is project aims to build a Ampache + Mageia 9 docker image. Features: - - ... + - Based on rx3/mariadb-mga9:1.0.0 diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index b20f5ed..e6b1742 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,12 @@ +------------------------------------------------------------------------------------------------------------------------------------ +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 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index a712b84..1421c54 100644 --- a/compose.yaml +++ b/compose.yaml @@ -7,23 +7,27 @@ services: database: container_name: ${IMG_NAME}-mysql - image: mariadb:11.4.3-ubi9 + image: ${IMG_URL_PREFIX}/mariadb-mga9:1.0.0 environment: - MARIADB_ROOT_PASSWORD: mysqladmin - MARIADB_DATABASE: ampache - MARIADB_USER: ampache - MARIADB_PASSWORD: ampacheadmin - MARIADB_ROOT_HOST: '%' # needs to be enclosed with quotes - - user: "983:981" - + MARIADB_UID: ${MARIADB_UID} + MARIADB_GID: ${MARIADB_GID} + MARIADB_ROOT_HOST: ${MARIADB_ROOT_HOST} + MARIADB_ROOT_PASSWORD: ${MARIADB_ROOT_PASSWORD} + MARIADB_DATABASE: ${MARIADB_DATABASE} + MARIADB_USER: ${MARIADB_USER} + 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