Add support for burp v3

Author: pschiffe

.github/workflows/docker-image-v3.yml

@@ -0,0 +1,72 @@
+name: Docker Image CI v3
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ v3 ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-v3
+
+    steps:
+
+      - name: Check Out Repo
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
+      - name: Build burp server
+        id: docker_build_burp_server_v3
+        uses: docker/build-push-action@v5
+        with:
+          context: ./burp-server
+          file: ./burp-server/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          builder: ${{ steps.buildx.outputs.name }}
+          push: true
+          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/burp-server:v3
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build_burp_server_v3.outputs.digest }}
+
+      - name: Build burp ui
+        id: docker_build_burp_ui_v3
+        uses: docker/build-push-action@v5
+        with:
+          context: ./burp-ui
+          file: ./burp-ui/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          builder: ${{ steps.buildx.outputs.name }}
+          push: true
+          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/burp-ui:v3
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build_burp_ui_v3.outputs.digest }}
+
+      - name: Build burp client
+        id: docker_build_burp_client_v3
+        uses: docker/build-push-action@v5
+        with:
+          context: ./burp-client
+          file: ./burp-client/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          builder: ${{ steps.buildx.outputs.name }}
+          push: true
+          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/burp-client:v3
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build_burp_client_v3.outputs.digest }}

README.md

@@ -1,6 +1,6 @@
 # Burp Backup in Docker
 
-This repository contains Docker images for the [Burp 2.x](http://burp.grke.org/) server, client, and [web UI](https://git.ziirish.me/ziirish/burp-ui). All images are available at Docker Hub:
+This repository contains Docker images for the [Burp](http://burp.grke.org/) server, client, and [web UI](https://git.ziirish.me/ziirish/burp-ui). All images are available at Docker Hub:
 
 https://hub.docker.com/r/pschiffe/burp-server/
 

burp-client/Dockerfile

@@ -6,10 +6,10 @@ RUN echo 'install_weak_deps=False' >> /etc/dnf/dnf.conf \
   && dnf install dnf-plugins-core epel-release \
   && dnf config-manager --set-disabled epel-cisco-openh264 \
   && dnf config-manager --set-enabled crb \
-  && dnf copr enable yopito/burp2 \
+  && dnf copr enable hnsz2002/burp-stable \
   && dnf --refresh upgrade \
   && dnf install \
-    burp2-client \
+    burp-client \
     gettext \
     hostname \
   && dnf clean all \

burp-client/burp.conf.tpl

@@ -7,7 +7,7 @@ password = ${BURP_CLIENT_PASSWORD}
 cname = ${HOSTNAME}
 # A different port to use for restores - see the man page for more options.
 #port_restore = 5971
-pidfile = /var/run/burp.client.pid
+pidfile = /run/burp.client.pid
 syslog = 0
 stdout = 1
 progress_counter = 1

burp-server/Dockerfile

@@ -6,10 +6,10 @@ RUN echo 'install_weak_deps=False' >> /etc/dnf/dnf.conf \
   && dnf install dnf-plugins-core epel-release \
   && dnf config-manager --set-disabled epel-cisco-openh264 \
   && dnf config-manager --set-enabled crb \
-  && dnf copr enable yopito/burp2 \
+  && dnf copr enable hnsz2002/burp-stable \
   && dnf --refresh upgrade \
   && dnf install \
-    burp2-server \
+    burp-server \
     fuse-encfs \
     gettext \
     hostname \

burp-server/burp-server.conf

@@ -20,7 +20,7 @@ max_status_children = 5
 directory = ${BURP_DATA_DIRECTORY}
 dedup_group = global
 clientconfdir = /etc/burp/clientconfdir
-pidfile = /var/run/burp.server.pid
+pidfile = /run/burp.server.pid
 hardlinked_archive = 0
 working_dir_recovery_method = delete
 umask = 0022

burp-server/burp.conf

@@ -7,7 +7,7 @@ password = ${CLIENT_PASSWORD}
 cname = localclient
 # A different port to use for restores - see the man page for more options.
 #port_restore = 5971
-pidfile = /var/run/burp.client.pid
+pidfile = /run/burp.client.pid
 syslog = 0
 stdout = 1
 progress_counter = 1