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

- Move & Rename repo from Rx3/Ampache-MGA9 to Rx3-Docker/Ampache,

Browse Source 
- New version naming standard,
- Now use docker_tools for .env building,
- Now use rx3-docker/php-apache:1.4.0-mga9 & rx3-docker/mariadb-1.1.0-mga9 images,
- Add /var/log/init*, /var/log/supervisor* volumes,
- Fix crontab: user ampache user instead of root and add it to git,
- Fix database restart in compose file,
- Add database healthcheck & webapp service depencies.
This commit is contained in:
Arnaud G. GIBERT
2024-12-02 16:51:20 +01:00
parent 5c3076ba6f
commit aa2c81cca9
19 changed files with 170 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
env.dist
View File

@@ -5,9 +5,10 @@
# Global Settings
#-------------------------------------------------------------------------------
APPL_ORG="rx3"
APPL_REGISTRY="docker.xor.rx3:5000"
APPL_URL_PREFIX="${APPL_REGISTRY}/${APPL_ORG}"
ORG_NAME="rx3-docker"
ORG_REGISTRY="docker.xor.rx3:5000"
ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
@@ -15,11 +16,11 @@ APPL_URL_PREFIX="${APPL_REGISTRY}/${APPL_ORG}"
# Image Settings
#-------------------------------------------------------------------------------
APPL_NAME="ampache-mga9"
APPL_FULL_NAME="Rx3 Ampache Mageia-9 Docker Image"
APPL_SHORT_NAME="ampache"
APPL_VERSION="1.2.2"
APPL_URL="${APPL_URL_PREFIX}/${APPL_NAME}:${APPL_VERSION}"
APPL_NAME="ampache"
APPL_NAME_FULL="Ampache"
APPL_NAME_SHORT="ampache"
APPL_ORG="rx3-docker"
APPL_VERSION="1.3.0"
APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
@@ -45,17 +46,40 @@ VIDEO_REPO="./opt/video"
if [[ "${APPL_ENV}" != "prd" ]]
then
APPL_SUFFIX="-${APPL_ENV}"
ENV_PORT_OFFSET=100
PORT_ENV_OFFSET=100
else
APPL_SUFFIX=""
ENV_PORT_OFFSET=0
PORT_ENV_OFFSET=0
fi
CONT_NAME_PREFIX=${APPL_NAME/-mga9}${APPL_SUFFIX}
ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
APPL_URL_PREFIX="${ORG_REGISTRY}/${APPL_ORG}/${APPL_NAME_SHORT}"
SV_PORT_OFFSET=1000
NETWORK_NAME=${CONT_NAME_PREFIX}
NETWORK_IF_NAME=br-${APPL_SHORT_NAME}-${APPL_ENV}
HOST_NAME_PREFIX=${APPL_NAME_SHORT}${APPL_SUFFIX}
PORT_ENV_OFFSET=0
PORT_SV_INT=9001
PORT_SV_OFFSET=1000
NETWORK_NAME=${HOST_NAME_PREFIX}
NETWORK_IF_NAME=br-${APPL_NAME_SHORT}-${APPL_ENV}
DOCKER_TOOLS_DEBUG=FALSE
DOCKER_TOOLS_VOLUME=MERGED
#DOCKER_TOOLS_EXECPTION_LIBS="postgres:pgsql"
#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+-----------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
# | Variable | Service | Target Image | From Image | Module | Main Port | Admin Port | User | Group |
# | Prefix | Name | URL Prefix | Name | Name Full | Version | URL Prefix | Name | Version | Name | Version | Ext | Int | Ext | Int | Name / Id | Name / Id |
#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+-----------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
docker_service_add DB database ${ORG_URL_PREFIX} mariadb - 1.1.0-mga9 - - - mysql - 8006 3306 - - postgres postgres
docker_service_add WAI webapp-internal ${ORG_URL_PREFIX} ampache "Rx3-Docker/Ampache" 1.3.0-mga9 ${ORG_URL_PREFIX} php-apache 1.4.0-mga9 - - 8085 80 - - apache apache
docker_service_add WAE webapp-external ${ORG_URL_PREFIX} ampache - 1.3.0-mga9 - - - - - 8086 80 - - apache apache
@@ -63,18 +87,11 @@ NETWORK_IF_NAME=br-${APPL_SHORT_NAME}-${APPL_ENV}
# Database
#-------------------------------------------------------------------------------
DATABASE_IMG=${APPL_URL_PREFIX}/mariadb-mga9:1.0.2
DATABASE_CONT_NAME="${CONT_NAME_PREFIX}-database"
DATABASE_PORT=$(( 8006 + ${ENV_PORT_OFFSET}))
DATABASE_SV_PORT=$(( ${DATABASE_PORT} + ${SV_PORT_OFFSET}))
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"
DB_ROOT_HOST='%' # needs to be enclosed with quotes
DB_ROOT_PASSWORD="mysqladmin"
DB_DB_NAME="ampache"
DB_DB_USER="ampache"
DB_DB_PASSWORD="ampacheadmin"
@@ -82,16 +99,9 @@ MARIADB_PASSWORD="ampacheadmin"
# WebApp
#-------------------------------------------------------------------------------
WEBAPP_IMG=${APPL_URL}
WEBAPP_INT_CONT_NAME="${CONT_NAME_PREFIX}-webapp-internal"
WEBAPP_INT_PORT=$(( 8085 + ${ENV_PORT_OFFSET}))
WEBAPP_INT_SV_PORT=$(( ${WEBAPP_INT_PORT} + ${SV_PORT_OFFSET}))
WEBAPP_EXT_CONT_NAME="${CONT_NAME_PREFIX}-webapp-external"
WEBAPP_EXT_PORT=$(( ${WEBAPP_INT_PORT} + 1))
WEBAPP_EXT_SV_PORT=$(( ${WEBAPP_EXT_PORT} + ${SV_PORT_OFFSET}))
APACHE_UID=980
APACHE_GID=977
APACHE_DOC_ROOT=/var/www/public
WAI_LOG_MAIN_INT="/var/log/httpd"
WAI_LOG_MAIN_EXT="./var/log/httpd-webapp-internal"
WAE_LOG_MAIN_INT="/var/log/httpd"
WAE_LOG_MAIN_EXT="./var/log/httpd-webapp-external"