rixty
/
AzuraCast
mirror of https://github.com/AzuraCast/AzuraCast.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes #6706 -- Fix secondary issues caused by moving storage dirs; correct Docker volume specs.

This commit is contained in:
Buster Neece 2023-11-03 08:56:10 -05:00
parent 5d3d765e77
commit 73c6784509
No known key found for this signature in database
4 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Dockerfile
View File

@ -58,7 +58,8 @@ RUN bash /bd_build/redis/setup.sh
COPY ./util/docker/docs /bd_build/docs/
RUN bash /bd_build/docs/setup.sh
RUN bash /bd_build/cleanup.sh \
RUN bash /bd_build/chown_dirs.sh \
bash /bd_build/cleanup.sh \
&& rm -rf /bd_build
USER azuracast
@ -67,7 +68,14 @@ RUN touch /var/azuracast/.docker
USER root
VOLUME ["/var/azuracast/stations", "/var/azuracast/uploads", "/var/azuracast/backups", "/var/azuracast/sftpgo/persist", "/var/azuracast/servers/shoutcast2", "/var/azuracast/meilisearch/persist"]
VOLUME "/var/azuracast/stations"
VOLUME "/var/azuracast/backups"
VOLUME "/var/azuracast/storage/uploads"
VOLUME "/var/azuracast/storage/shoutcast2"
VOLUME "/var/azuracast/storage/stereo_tool"
VOLUME "/var/azuracast/storage/geoip"
VOLUME "/var/azuracast/storage/sftpgo"
VOLUME "/var/azuracast/storage/acme"
#
# Development Build

5
util/docker/common/chown_dirs.sh Normal file
View File

@ -0,0 +1,5 @@
#!/bin/bash
set -e
set -x
chown -R azuracast:azuracast /var/azuracast

2
util/docker/web/nginx/azuracast.conf.tmpl
View File

@ -118,7 +118,7 @@ server {
location /static/uploads {
rewrite ^(.+)\.(?:\w+)\.(js|css|png|jpg|webp)$ $1.$2 last;
alias /var/azuracast/uploads;
alias {{ default .Env.UPLOADS_DIR "/var/azuracast/storage/uploads" }};
try_files $uri =404;
}

9
util/docker/web/startup_scripts/05_nginx_conf.sh
View File

@ -1,5 +1,14 @@
#!/bin/bash
# Determine the current uploads dir for the installation.
if [ -z "$UPLOADS_DIR" ]; then
if [ -d "/var/azuracast/uploads" ]; then
export UPLOADS_DIR="/var/azuracast/uploads"
else
export UPLOADS_DIR="/var/azuracast/storage/uploads"
fi
fi
# Copy the nginx template to its destination.
dockerize -template "/etc/nginx/nginx.conf.tmpl:/etc/nginx/nginx.conf" \
-template "/etc/nginx/azuracast.conf.tmpl:/etc/nginx/sites-available/default"