Backed out changeset c324ff9bf17e (bug 1643504) for breaking Docker Images. CLOSED TREE

taskcluster/ci/docker-image/kind.yml

@@ -184,7 +184,7 @@ jobs:
             - deb10-python-zstandard
     android-build:
         symbol: I(agb)
-        parent: debian10-base
+        parent: debian9-base
         packages:
             - deb8-valgrind
     fetch:

taskcluster/docker/android-build/Dockerfile

@@ -44,10 +44,6 @@ RUN apt-get update && \
 # %include taskcluster/docker/recipes/xvfb.sh
 COPY topsrcdir/taskcluster/docker/recipes/xvfb.sh /builds/worker/scripts/xvfb.sh
 
-# %include taskcluster/docker/recipes/prepare_openjdk.sh
-COPY topsrcdir/taskcluster/docker/recipes/prepare_openjdk.sh /tmp/prepare_openjdk.sh
-RUN /tmp/prepare_openjdk.sh && rm /tmp/prepare_openjdk.sh
-
 # Reset user/workdir from parent image so we can install software.
 WORKDIR /
 USER root
@@ -57,7 +53,7 @@ USER root
 
 # Observe missing --no-install-recommends, in order to install glib2.0/gconf/etc.
 RUN apt-get install \
-      libgconf-2-4 \
+      libgconf2-4 \
       libgnome2-0 \
       openjdk-8-jdk-headless
 

taskcluster/docker/recipes/prepare_openjdk.sh

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -x
-
-# Debian 10 doesn't have openjdk-8, so add the Debian 9 repository, which contains it.
-if grep -q ^10\\. /etc/debian_version; then
-	sed s/buster/stretch/ /etc/apt/sources.list | tee /etc/apt/sources.list.d/stretch.list
-	apt-get update
-fi