From b5509d134fe39365053dbd79bf3a62491f9f107b Mon Sep 17 00:00:00 2001 From: Fabien <71275745+fvn-elmy@users.noreply.github.com> Date: Wed, 15 Jan 2025 18:22:26 +0100 Subject: [PATCH] :hammer: upgrade docker package dependencies following recent libwebkit2gtk upgrade handle missing cargo/git folder --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 20ed8a9db..bf873601f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,8 @@ FROM rust:1.80-slim AS cargo-builder RUN --mount=type=cache,target=/var/cache/apt \ --mount=type=cache,target=/usr/local/cargo/registry \ apt-get update && apt-get install -y --no-install-recommends \ - libdbus-1-dev libsoup2.4-dev libjavascriptcoregtk-4.0-dev \ - libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev \ + libdbus-1-dev libsoup-3.0-dev libjavascriptcoregtk-4.1-dev \ + libwebkit2gtk-4.1-dev build-essential curl wget libssl-dev \ libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev \ gnome-video-effects COPY . /pake @@ -17,6 +17,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \ cargo build --release && \ mkdir -p /cargo-cache && \ cp -R /usr/local/cargo/registry /cargo-cache/ && \ + ([ -d "/usr/local/cargo/git" ] && cp -R /usr/local/cargo/git /cargo-cache/ || mkdir -p /usr/local/cargo/git) && \ cp -R /usr/local/cargo/git /cargo-cache/ # Verify the content of /cargo-cache && clean unnecessary files RUN ls -la /cargo-cache/registry && ls -la /cargo-cache/git && rm -rfd /cargo-cache/registry/src @@ -27,7 +28,7 @@ FROM rust:1.80-slim AS builder RUN --mount=type=cache,target=/var/cache/apt \ --mount=type=cache,target=/usr/local/cargo/registry \ apt-get update && apt-get install -y --no-install-recommends \ - libdbus-1-dev libsoup2.4-dev libjavascriptcoregtk-4.1-dev \ + libdbus-1-dev libsoup-3.0-dev libjavascriptcoregtk-4.1-dev \ libwebkit2gtk-4.1-dev build-essential curl wget libssl-dev \ libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev \ gnome-video-effects