From 89cda9d3f506cfc267a4cb9393e7b42f7ad7a30b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gre=CC=81gory?= Date: Mon, 10 Jul 2023 11:16:02 +0200 Subject: [PATCH] PBS --- .env | 12 ++++++++++++ Dockerfile | 4 +++- Dockerfile.client | 4 +++- docker-entrypoint.sh | 3 +++ 4 files changed, 21 insertions(+), 2 deletions(-) create mode 100755 .env diff --git a/.env b/.env new file mode 100755 index 0000000..04d25dc --- /dev/null +++ b/.env @@ -0,0 +1,12 @@ +MSMTP_HOST=srv3.209a.fr +MSMTP_PORT=587 +MSMTP_TLS=on +MSMTP_STARTTLS=on +MSMTP_TLSCHECK=off +MSMTP_AUTH=on +MSMTP_USER=svc_srv68@gabutto.fr +MSMTP_PASSWORD='Z274J4Jj /etc/apt/sources.list.d/proxmox.list \ && mkdir -p /var/lib/dhcp/ \ && apt-get update \ - && apt-get install -y proxmox-backup-server=2.3.1-1 proxmox-backup-client=2.3.1-1 nfs-common supervisor msmtp-mta gettext-base \ + && apt-get install -y proxmox-backup-server=${PBS_VERSION} proxmox-backup-client=${PBS_VERSION} nfs-common supervisor msmtp-mta gettext-base \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* COPY msmtprc /etc/msmtprc diff --git a/Dockerfile.client b/Dockerfile.client index 891e63d..92327e6 100644 --- a/Dockerfile.client +++ b/Dockerfile.client @@ -1,8 +1,10 @@ FROM debian:bullseye-slim +ARG PBS_VERSION=2.4.1-1 + ADD http://download.proxmox.com/debian/proxmox-release-bullseye.gpg /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg #add key and apt install etc RUN chmod 644 /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg && echo "deb http://download.proxmox.com/debian/pbs bullseye pbs-no-subscription" > /etc/apt/sources.list.d/proxmox.list \ - && apt-get update && apt-get install -y proxmox-backup-client=2.3.1-1 \ + && apt-get update && apt-get install -y proxmox-backup-client=${PBS_VERSION} \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 5f2869b..409d9c0 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -40,4 +40,7 @@ envsubst < /tmp/msmtprc.env > /etc/msmtprc cp /etc/supervisor/conf.d/supervisord.conf /tmp/supervisord.conf envsubst < /tmp/supervisord.conf > /etc/supervisor/conf.d/supervisord.conf +# Remove lock files if present +rm /etc/proxmox-backup/*.lock /etc/proxmox-backup/.*.lck + exec "$@" \ No newline at end of file