Bug 1850043 - Bring tb-flatpak Docker image more inline with tb-snap. r=rjl DONTBUILD

Differential Revision: https://phabricator.services.mozilla.com/D205475

--HG--
rename : taskcluster/docker/tb-flatpak/runme.sh => taskcluster/docker/tb-flatpak/repack.sh
extra : moz-landing-system : lando

taskcluster/ci/release-flatpak-repackage/kind.yml

@@ -36,7 +36,7 @@ job-defaults:
         command:
             - /bin/bash
             - -cx
-            - ./runme.sh
+            - ./repack.sh
         env:
             VERSION: "{release_config[version]}"
             BUILD_NUMBER: "{release_config[build_number]}"

taskcluster/docker/tb-flatpak/Dockerfile

@@ -1,5 +1,5 @@
 FROM freedesktopsdk/flatpak:22.08-x86_64
-MAINTAINER tb-builds@thunderbird.net
+MAINTAINER daniel@thunderbird.net
 
 # Create scripts directory
 RUN mkdir /scripts/

taskcluster/docker/tb-flatpak/extract_locales_from_l10n_json.py

@@ -1,18 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"""
-
-
-import json
-import sys
-
-l10n_changesets_json_path = sys.argv[1]
-with open(l10n_changesets_json_path) as f:
-    locales = json.load(f).keys()
-linux_locales = [l for l in locales if l != "ja-JP-mac"]
-
-print("\n".join(sorted(linux_locales)))

taskcluster/docker/tb-flatpak/repack.sh

@@ -50,9 +50,10 @@ rm -rf ~/.local/share/flatpak/
 $CURL -o "${WORKSPACE}/thunderbird.tar.bz2" \
     "${CANDIDATES_DIR}/${VERSION}-candidates/build${BUILD_NUMBER}/linux-x86_64/en-US/thunderbird-${VERSION}.tar.bz2"
 
-# Fetch list of Thunderbird locales
-$CURL -o "${WORKSPACE}/l10n-changesets.json" "$L10N_CHANGESETS"
-locales=$(python3 "$SCRIPT_DIR/extract_locales_from_l10n_json.py" "${WORKSPACE}/l10n-changesets.json")
+# Download locale information and extract locales to be included in snap
+$CURL -o "${WORKSPACE}/onchange-locales" "${RAW_FILE_URL}/mail/locales/onchange-locales"
+$CURL -o "${WORKSPACE}/l10n-changesets.json" "${RAW_FILE_URL}/mail/locales/l10n-changesets.json"
+locales=$(< "${WORKSPACE}/onchange-locales" sed "s/ja-JP-mac//")
 
 # Fetch langpack extension for each locale
 mkdir -p "$DISTRIBUTION_DIR"
@@ -166,7 +167,6 @@ flatpak build-finish build                                      \
         --socket=cups                                           \
         --require-version=0.10.3                                \
         --persist=.thunderbird                                  \
-        --env=DICPATH=/usr/share/hunspell                       \
         --filesystem=xdg-download:rw                            \
         --filesystem=~/.gnupg                                   \
         --filesystem=xdg-run/gnupg:ro                           \