Skip to content

Commit 255dd68

Browse files
committed
update webui and dir
1 parent fc39689 commit 255dd68

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

director/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ LABEL org.label-schema.schema-version="1.0" \
1717

1818
SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
1919

20-
RUN apk add --no-cache bareos bareos-postgresql postgresql-client curl tzdata tar
20+
RUN apk add --no-cache bareos bareos-postgresql postgresql-client curl tzdata tar bash iputils-ping
2121

2222
RUN tar czf /bareos-dir.tgz /etc/bareos
23+
RUN mv /etc/bareos/scripts /usr/lib/bareos/scripts
2324
RUN mkdir /run/bareos \
2425
&& chown bareos /run/bareos
2526

director/docker-entrypoint.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,10 @@ if [ ! -f /etc/bareos/bareos-config.control ]; then
8282
# Control file
8383
touch /etc/bareos/bareos-config.control
8484
fi
85-
85+
# test if scrip is here case of migration from debian
86+
if! -d /etc/bareos/scripts ];then
87+
tar -xzf /bareos-dir.tgz etc/bareos/scripts
88+
fi
8689
if [[ -z ${CI_TEST} ]] ; then
8790
# Waiting Postgresql is up
8891
sqlup=1

webui/docker-entrypoint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,6 @@ sed -i "s#client_max_body_size 1m#client_max_body_size 20m#" /etc/nginx/nginx.co
2323
# set php-fpm host andd port
2424
sed -i "s/fastcgi_pass 127.0.0.1:9000;/fastcgi_pass ${PHP_FPM_HOST}:${PHP_FPM_PORT};/" /etc/nginx/http.d/bareos-webui.conf
2525

26+
# starting fpm
27+
/usr/sbin/php-fpm82 --fpm-config /etc/php82/php-fpm.conf
2628
exec "$@"

0 commit comments

Comments
 (0)