Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-14 02:31:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1782828 - Bump snap dependencies core18=>20 and gnome-3-34=>38 r=gerard-majax,gbrown

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D153734
This commit is contained in:
Johan Lorenzo 2022-08-04 17:00:34 +00:00
parent c227f2e0d3
commit 1afc9a0810
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
taskcluster/docker/firefox-snap/Dockerfile
View File

@ -2,7 +2,9 @@
## The modifications done are part of the documentation for enabling core18 snaps.
## https://snapcraft.io/docs/t/creating-docker-images-for-snapcraft/11739
FROM ubuntu:bionic
# /!\ The base image must follow the version of the `coreXX` package
# https://forum.snapcraft.io/t/issues-dockerizing-a-snapcraft-build-process/30294/5
FROM ubuntu:focal
ENV LANG='en_US.UTF-8' \
LANGUAGE='en_US:en' \
@ -11,7 +13,10 @@ ENV LANG='en_US.UTF-8' \
SNAP='/snap/snapcraft/current' \
SNAP_NAME='snapcraft' \
SNAP_ARCH='amd64' \
TERM='dumb'
TERM='dumb' \
TZ='Etc/UTC'
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# Grab dependencies. snapd is now required per https://github.com/snapcore/snapcraft/pull/3210
RUN apt-get update && \
@ -34,14 +39,17 @@ locale-gen "$LANG"
COPY download_and_install_snap.sh .
# Grab the core snap (for backwards compatibility)
RUN bash download_and_install_snap.sh 'core'
# Grab the core18 snap (which snapcraft uses as a base)
RUN bash download_and_install_snap.sh 'core18'
RUN bash download_and_install_snap.sh 'gnome-3-34-1804'
RUN bash download_and_install_snap.sh 'gnome-3-34-1804-sdk'
RUN bash download_and_install_snap.sh 'core20'
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'
# Fix Python3 installation: Make sure we use the interpreter from
# the snapcraft snap:
RUN unlink /snap/snapcraft/current/usr/bin/python3 && \
ln -s /snap/snapcraft/current/usr/bin/python3.* /snap/snapcraft/current/usr/bin/python3 && \
echo /snap/snapcraft/current/lib/python3.*/site-packages >> /snap/snapcraft/current/usr/lib/python3/dist-packages/site-packages.pth
# Create a snapcraft runner (TODO: move version detection to the core of snapcraft).
RUN mkdir -p /snap/bin
RUN echo "#!/bin/sh" > /snap/bin/snapcraft

8
taskcluster/docker/firefox-snap/firefox.snapcraft.yaml.in
View File

@ -4,7 +4,7 @@ summary: Mozilla Firefox web browser
description: Firefox is a powerful, extensible web browser with support for modern web application technologies.
confinement: strict
grade: stable
base: core18
base: core20
compression: lzo
apps:
@ -12,7 +12,7 @@ apps:
command: firefox
command-chain: [tmpdir]
desktop: distribution/firefox.desktop
extensions: [gnome-3-34]
extensions: [gnome-3-38]
environment:
HOME: "$SNAP_USER_COMMON"
GTK_USE_PORTAL: 1
@ -78,10 +78,10 @@ parts:
cleanup:
after: [firefox]
plugin: nil
build-snaps: [core18, gnome-3-34-1804]
build-snaps: [core20, gnome-3-38-2004]
override-prime: |
set -eux
for snap in "core18" "gnome-3-34-1804"; do
for snap in "core20" "gnome-3-38-2004"; do
cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" \;
done