зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1598055 - further trim packages from ubuntu1804-test docker image r=jmaher
Changes: Pin the source docker image to a specific tag from canonical. Remove unneeded packages that are either installed as part of the setup, or come preinstalled. Silence the `dbus` startup message by redirecting the output to `2&>1`. Remove unnecessary `locale-gen` call at the end of setup. Differential Revision: https://phabricator.services.mozilla.com/D65434 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
a2c1272473
Коммит
6e0e6a4c13
|
@ -32,9 +32,11 @@ apt_packages+=('gcc-multilib')
|
|||
apt_packages+=('gir1.2-gnomebluetooth-1.0')
|
||||
apt_packages+=('git')
|
||||
apt_packages+=('gnome-icon-theme')
|
||||
apt_packages+=('gstreamer1.0-gtk3')
|
||||
apt_packages+=('gstreamer1.0-plugins-base')
|
||||
apt_packages+=('gstreamer1.0-plugins-good')
|
||||
apt_packages+=('gstreamer1.0-tools')
|
||||
apt_packages+=('gstreamer1.0-pulseaudio')
|
||||
apt_packages+=('language-pack-en-base')
|
||||
apt_packages+=('libc6-dbg')
|
||||
apt_packages+=('libasound2-dev')
|
||||
|
@ -153,17 +155,22 @@ valgrind date
|
|||
|
||||
# Build a list of packages to purge from the image.
|
||||
apt_packages=()
|
||||
apt_packages+=('*alsa*')
|
||||
apt_packages+=('*cheese*')
|
||||
apt_packages+=('example-content')
|
||||
apt_packages+=('git')
|
||||
apt_packages+=('gnome-calendar')
|
||||
apt_packages+=('gnome-initial-setup')
|
||||
apt_packages+=('gnome-mahjongg')
|
||||
apt_packages+=('gnome-mines')
|
||||
apt_packages+=('gnome-sudoku')
|
||||
apt_packages+=('libx11-doc')
|
||||
apt_packages+=('manpages-dev')
|
||||
apt_packages+=('orca')
|
||||
apt_packages+=('rhythmbox')
|
||||
apt_packages+=('thunderbird')
|
||||
apt_packages+=('ubuntu-release-upgrader*')
|
||||
apt_packages+=('update-manager-core')
|
||||
apt_packages+=('update-manager')
|
||||
apt_packages+=('*whoopsie*')
|
||||
apt_packages+=('yelp')
|
||||
|
||||
# Purge unnecessary packages
|
||||
|
@ -177,8 +184,6 @@ rm -rf /usr/share/help /usr/share/doc /usr/share/man
|
|||
|
||||
# Remove all locale files other than en_US.UTF-8
|
||||
rm -rf /usr/share/locale/ /usr/share/locale-langpack/ /usr/share/locales/
|
||||
echo "en_US.UTF-8 UTF-8" > /var/lib/locales/supported.d/en
|
||||
locale-gen
|
||||
|
||||
# Further cleanup
|
||||
cd /
|
||||
|
|
|
@ -1,8 +1,4 @@
|
|||
# The base image is a last known working snapshot of this image. We do this
|
||||
# to work around problems rebuilding desktop1604-test. See bug 1503756 for
|
||||
# the ugly details. Bug 1511527 tracks undoing this hack and building from
|
||||
# a fresh ubuntu image.
|
||||
FROM ubuntu:18.04
|
||||
FROM ubuntu:bionic-20200112
|
||||
MAINTAINER Edwin Takahashi <egao@mozilla.com>
|
||||
|
||||
# Create necessary directories and worker user account
|
||||
|
|
|
@ -2,6 +2,6 @@
|
|||
|
||||
set -e
|
||||
|
||||
/etc/init.d/dbus start
|
||||
/etc/init.d/dbus start 2&>1
|
||||
|
||||
exec "${@}"
|
Загрузка…
Ссылка в новой задаче