From 509a354c9bdcceaca146517676675cb37b95f026 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Sat, 1 Feb 2020 15:49:30 +0100 Subject: [PATCH] Switched to parameter-less build and environment-controlled run script --- Dockerfile | 26 ++++++++++---------------- run.sh | 14 ++++++++++++++ 2 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 run.sh diff --git a/Dockerfile b/Dockerfile index c67f6a9..5833d3e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,17 @@ -from debian:stretch +from debian -ARG SERVER_NAME=urbackup-server -ARG CLIENT_NAME=urbackup-client -ARG CLIENT_KEY=secret_key - -RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y mktemp wget +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y wget RUN TF=`mktemp` &&\ wget "https://hndl.urbackup.org/Client/latest/update/UrBackupUpdateLinux.sh" -O $TF &&\ - sh $TF &&\ - rm $TF &&\ - urbackupclientctl wait-for-backend &&\ - urbackupclientctl set-settings -k internet_mode_enabled -v true -k internet_server -v ${SERVER_NAME} -k internet_server_port -v 55415 -k computername -v "${CLIENT_NAME}" -k internet_authkey -v ${CLIENT_KEY} &&\ - urbackupclientctl add-backupdir --path /backup - -RUN ( [ ! -e /etc/default/urbackupclient ] || sed -i 's/INTERNET_ONLY=false/INTERNET_ONLY=true/' /etc/default/urbackupclient ) &&\ - ( [ ! -e /etc/default/urbackupclient ] || sed -i 's/LOGLEVEL=warn/LOGLEVEL=info/' /etc/default/urbackupclient ) &&\ - ( [ ! -e /etc/default/urbackupclient ] || sed -i 's/RESTORE=disabled/RESTORE=server-confirms/' /etc/default/urbackupclient ) + sh $TF silent &&\ + rm $TF EXPOSE 35621/TCP 35622/UDP 35623/TCP -CMD ["urbackupclientbackend", "--config", "/etc/default/urbackupclient"] +HEALTHCHECK CMD urbackupclientbackend status + +WORKDIR /app +COPY run.sh /app + +CMD ["sh", "run.sh"] diff --git a/run.sh b/run.sh new file mode 100644 index 0000000..7ff16dc --- /dev/null +++ b/run.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env sh + +urbackupclientbackend --loglevel info --restore server-confirms --internet-only & +urbackupclientctl wait-for-backend + +urbackupclientctl set-settings -k internet_mode_enabled -v true +urbackupclientctl set-settings -k internet_server -v $SERVER_NAME +urbackupclientctl set-settings -k internet_server_port -v 55415 +urbackupclientctl set-settings -k computername -v $CLIENT_NAME +urbackupclientctl set-settings -k internet_authkey -v $CLIENT_KEY + +urbackupclientctl add-backupdir --path /backup + +sleep infinity