Fixes #6706 -- Fix secondary issues caused by moving storage dirs; correct Docker volume specs.
This commit is contained in:
parent
5d3d765e77
commit
73c6784509
12
Dockerfile
12
Dockerfile
|
@ -58,7 +58,8 @@ RUN bash /bd_build/redis/setup.sh
|
||||||
COPY ./util/docker/docs /bd_build/docs/
|
COPY ./util/docker/docs /bd_build/docs/
|
||||||
RUN bash /bd_build/docs/setup.sh
|
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
|
&& rm -rf /bd_build
|
||||||
|
|
||||||
USER azuracast
|
USER azuracast
|
||||||
|
@ -67,7 +68,14 @@ RUN touch /var/azuracast/.docker
|
||||||
|
|
||||||
USER root
|
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
|
# Development Build
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
set -x
|
||||||
|
|
||||||
|
chown -R azuracast:azuracast /var/azuracast
|
|
@ -118,7 +118,7 @@ server {
|
||||||
location /static/uploads {
|
location /static/uploads {
|
||||||
rewrite ^(.+)\.(?:\w+)\.(js|css|png|jpg|webp)$ $1.$2 last;
|
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;
|
try_files $uri =404;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,14 @@
|
||||||
#!/bin/bash
|
#!/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.
|
# Copy the nginx template to its destination.
|
||||||
dockerize -template "/etc/nginx/nginx.conf.tmpl:/etc/nginx/nginx.conf" \
|
dockerize -template "/etc/nginx/nginx.conf.tmpl:/etc/nginx/nginx.conf" \
|
||||||
-template "/etc/nginx/azuracast.conf.tmpl:/etc/nginx/sites-available/default"
|
-template "/etc/nginx/azuracast.conf.tmpl:/etc/nginx/sites-available/default"
|
||||||
|
|
Loading…
Reference in New Issue