Compare commits
No commits in common. "master" and "ampache-mga9-1.2.2" have entirely different histories.
master
...
ampache-mg
@ -1,13 +1,3 @@
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3/Ampache-Mga9 V 1.2.3 - A. GIBERT - 2024/10/xx
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- 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.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3/Ampache-Mga9 V 1.2.2 - A. GIBERT - 2024/10/06
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
18
compose.yaml
18
compose.yaml
@ -9,8 +9,6 @@ services:
|
||||
|
||||
image: ${DATABASE_IMG}
|
||||
|
||||
restart: unless-stopped
|
||||
|
||||
environment:
|
||||
MARIADB_UID: ${MARIADB_UID}
|
||||
MARIADB_GID: ${MARIADB_GID}
|
||||
@ -20,12 +18,6 @@ services:
|
||||
MARIADB_USER: ${MARIADB_USER}
|
||||
MARIADB_PASSWORD: ${MARIADB_PASSWORD}
|
||||
|
||||
healthcheck:
|
||||
test: ["CMD", 'mysqladmin', 'ping', '-h', 'localhost', '-u', 'root', '-p${MARIADB_ROOT_PASSWORD}' ]
|
||||
interval: 10s
|
||||
timeout: 3s
|
||||
retries: 3
|
||||
|
||||
volumes:
|
||||
- ./var/lib/mysql:/var/lib/mysql
|
||||
|
||||
@ -52,10 +44,6 @@ services:
|
||||
|
||||
restart: unless-stopped
|
||||
|
||||
depends_on:
|
||||
database:
|
||||
condition: service_healthy
|
||||
|
||||
environment:
|
||||
APACHE_UID: ${APACHE_UID}
|
||||
APACHE_GID: ${APACHE_GID}
|
||||
@ -67,7 +55,7 @@ services:
|
||||
- ./etc/cron.d/ampache:/etc/cron.d/ampache:ro
|
||||
- /etc/passwd:/etc/passwd:ro
|
||||
- /etc/group:/etc/group:ro
|
||||
- /etc/shadow:/etc/shadow:ro
|
||||
- /etc/shadow:/etc/shadow:ro
|
||||
- ${MUSIC_REPO}:/media/music
|
||||
- ${VIDEO_REPO}:/media/video
|
||||
|
||||
@ -85,10 +73,6 @@ services:
|
||||
|
||||
restart: unless-stopped
|
||||
|
||||
depends_on:
|
||||
database:
|
||||
condition: service_healthy
|
||||
|
||||
environment:
|
||||
APACHE_UID: ${APACHE_UID}
|
||||
APACHE_GID: ${APACHE_GID}
|
||||
|
4
etc/cron.d/.gitignore
vendored
Normal file
4
etc/cron.d/.gitignore
vendored
Normal file
@ -0,0 +1,4 @@
|
||||
# Ignore everything in this directory
|
||||
*
|
||||
# Except this file
|
||||
!.gitignore
|
@ -1,5 +0,0 @@
|
||||
# /etc/cron.d/ampache: crontab fragment for ampache server
|
||||
|
||||
PATH=/bin:/usr/bin:/usr/local/bin:/usr/local/sbin
|
||||
|
||||
15 3 * * * apache cd /var/www; php bin/cli run:updateCatalog -v -c -e -a -g >/var/log/ampache/catalog_update.log 2>&1
|
Loading…
Reference in New Issue
Block a user