diff --git a/Dockerfile b/Dockerfile index 9d06eb4..8cf0f3b 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,16 @@ # Pull base image. -FROM jlesage/baseimage-gui:alpine-3.22-v4 +FROM jlesage/baseimage-gui:alpine-3.24-v4 RUN apk upgrade --no-cache RUN add-pkg openssh-client rsync fuse python3 py3-pip py3-qt6 zstd-libs lz4-libs openssl \ qt6-qtbase py3-bcrypt py3-pynacl py3-peewee py3-psutil py3-wheel py3-cryptography fuse3 fuse3-libs \ mesa-dri-gallium font-croscore py3-platformdirs libxxhash firefox-esr ## Buld requirements which are deleted in same transaction so they don't impact image -RUN add-pkg --virtual build-dependencies py3-pkgconfig python3-dev py3-virtualenv openssl-dev zstd-dev acl-dev lz4-dev build-base qt6-qtbase-dev fuse-dev fuse3-dev xxhash-dev -RUN pip3 install --break-system-packages borgbackup vorta pyfuse3 -RUN del-pkg build-dependencies + ## Vorta 0.12 requires pyqt3 newer that what is in alpine 3.24. Tried building pyqt6 from source but it was a nightmare. So instead use older version. +RUN add-pkg --virtual build-dependencies py3-pkgconfig python3-dev openssl-dev zstd-dev acl-dev lz4-dev build-base qt6-qtbase-dev fuse-dev fuse3-dev xxhash-dev && \ + pip3 install --break-system-packages borgbackup pyfuse3 && \ + pip3 install --break-system-packages --no-deps vorta && \ + del-pkg build-dependencies # Copy the start script and force permissions just in case COPY --chmod=755 rootfs/ / diff --git a/README.md b/README.md index 39f5c02..a6eb386 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Vorta-Docker Run Vorta from Docker. -Currently using Vorta 0.11.6 release with Borg 1.4.5 on jlesage/baseimage-gui:alpine-3.22-v4 image +Currently using Vorta 0.12.0 release with Borg 1.4.5 on jlesage/baseimage-gui:alpine-3.24-v4 image Latest version includes embedded Firefox to view help links in UI. File links in the UI will not work but logs have been redirected and will appear in Docker logs. ## Usage diff --git a/build.sh b/build.sh index 9651032..20cd087 100755 --- a/build.sh +++ b/build.sh @@ -5,7 +5,7 @@ MYPID=$$ renice -n 19 -p $MYPID ionice -c 3 -p $MYPID -docker pull jlesage/baseimage-gui:alpine-3.22-v4 +docker pull jlesage/baseimage-gui:alpine-3.24-v4 # For testing local builds use the local label # user --no-cache if you want to force a rebuild of all layers, otherwise it will use the cache for unchanged layers DOCKER_BUILDKIT=1 docker build . -t nas:5000/vorta-docker:local