Merge branch '2.x'

.github/workflows/docker-image.yml

@@ -14,5 +14,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Build the Docker image
-      run: docker build . --file Dockerfile --tag pbs:$(date +%s)
+    - name: Build the Docker image for PBS
+      run: docker build . --file Dockerfile --tag pbs:$(date +%s) --tag pbs:${GITHUB_REF##*/}
+    - name: Build the Docker image for PBS Client
+      run: docker build . --file Dockerfile.client --tag pbs-client:$(date +%s) --tag pbs-client:${GITHUB_REF##*/}

Dockerfile

@@ -1,10 +1,14 @@
-FROM debian:buster
+FROM debian:bullseye
 
-ADD http://download.proxmox.com/debian/proxmox-ve-release-6.x.gpg /etc/apt/trusted.gpg.d/proxmox-ve-release-6.x.gpg
+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-ve-release-6.x.gpg && echo "deb http://download.proxmox.com/debian/pbs buster pbs-no-subscription" > /etc/apt/sources.list.d/proxmox.list \
-    && apt-get update && apt-get install -y proxmox-backup-server=1.1.13-3 nfs-common supervisor msmtp-mta gettext-base \
+RUN apt-get update \
+    && apt install -y ifupdown2 \
+    && 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 \
+    && 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 clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 COPY msmtprc /etc/msmtprc
@@ -16,5 +20,5 @@ RUN chmod a+x /docker-entrypoint.sh && chsh -s /bin/bash backup
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD ["/usr/bin/supervisord"]
-VOLUME [ "/etc/proxmox-backup", "/backups" ]
+VOLUME [ "/etc/proxmox-backup", "/backups", "/var/lib/proxmox-backup", "/var/log/proxmox-backup" ]
 STOPSIGNAL SIGINT

Dockerfile.client

@@ -1,8 +1,8 @@
-FROM debian:buster
+FROM debian:bullseye-slim
 
-ADD http://download.proxmox.com/debian/proxmox-ve-release-6.x.gpg /etc/apt/trusted.gpg.d/proxmox-ve-release-6.x.gpg
+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-ve-release-6.x.gpg && echo "deb http://download.proxmox.com/debian/pbs buster pbs-no-subscription" > /etc/apt/sources.list.d/proxmox.list \
-    && apt-get update && apt-get install -y proxmox-backup-client=1.1.13-2 \
+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 clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

docker-compose.yml

@@ -1,8 +1,8 @@
 version: '3'
 services:
   pbs:
-    #volumes: 
-    #  - ./etc/cas/services:/etc/cas/services:rw
+    tmpfs:
+      - /run
     build: .
     environment:
       - MSMTP_HOST
@@ -15,5 +15,18 @@ services:
       - MSMTP_PASSWORD
       - MSMTP_FROM
       - PBS_ADMIN_PASSWORD
+      - PUID
+      - PGID
     ports:
-     - "8007:8007"
+     - "8007:8007"
+    volumes:
+      - pbs_etc:/etc/proxmox-backup
+      - pbs_log:/var/log/proxmox-backup
+      - pbs_lib:/var/lib/proxmox-backup
+      - pbs_backups:/backups
+
+volumes:
+  pbs_etc:
+  pbs_log:
+  pbs_lib:
+  pbs_backups:

docker-entrypoint.sh

@@ -1,8 +1,18 @@
 #!/bin/bash
 set -e
 
-#Fix perm (34 is backup)
-chown -R 34:34 /etc/proxmox-backup
+#User mapping
+if [ -z $PUID ]; then export PUID=34; fi
+if [ -z $PGID ]; then export PGID=34; fi
+groupmod -o -g "$PGID" backup
+usermod -o -u "$PUID" backup
+
+#Fix perm
+mkdir -p /etc/proxmox-backup
+chown -R backup:backup /etc/proxmox-backup
+chown -R backup:backup /var/lib/proxmox-backup
+chown -R backup:backup /var/log/proxmox-backup
+chown -R backup:backup /backups
 chmod -R 700 /etc/proxmox-backup
 
 if [ -z $PBS_ADMIN_PASSWORD ]; then export PBS_ADMIN_PASSWORD=admin; fi
@@ -26,4 +36,8 @@ if [ -z $MSMTP_FROM ]; then export MSMTP_FROM=root@localhost; fi
 cp /etc/msmtprc /tmp/msmtprc.env
 envsubst < /tmp/msmtprc.env > /etc/msmtprc
 
+#Subst PUID/GID in supervisord
+cp /etc/supervisor/conf.d/supervisord.conf /tmp/supervisord.conf
+envsubst < /tmp/supervisord.conf > /etc/supervisor/conf.d/supervisord.conf
+
 exec "$@"