From 2d861407bd7e9cc56fba8f2f763fe62dddb4da81 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 05:41:35 +0200 Subject: Merging upstream version 115.12.0esr. Signed-off-by: Daniel Baumann --- taskcluster/docker/firefox-snap/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'taskcluster/docker') diff --git a/taskcluster/docker/firefox-snap/Dockerfile b/taskcluster/docker/firefox-snap/Dockerfile index dc002c0133..0f24a6bbd5 100644 --- a/taskcluster/docker/firefox-snap/Dockerfile +++ b/taskcluster/docker/firefox-snap/Dockerfile @@ -40,6 +40,8 @@ locale-gen "$LANG" COPY download_and_install_snap.sh . RUN bash download_and_install_snap.sh 'core20' +# Snapcraft now requires core22 for python3.10 +RUN bash download_and_install_snap.sh 'core22' RUN bash download_and_install_snap.sh 'gnome-3-38-2004' RUN bash download_and_install_snap.sh 'gnome-3-38-2004-sdk' RUN bash download_and_install_snap.sh 'snapcraft' @@ -57,6 +59,8 @@ RUN snap_version="$(awk '/^version:/{print $2}' /snap/snapcraft/current/meta/sna RUN echo 'exec "$SNAP/usr/bin/python3" "$SNAP/bin/snapcraft" "$@"' >> /snap/bin/snapcraft RUN chmod +x /snap/bin/snapcraft +RUN snapcraft version + RUN mkdir /scripts/ WORKDIR /scripts/ # Copy everything in the docker/firefox-snap folder but the Dockerfile -- cgit v1.2.3