From 17f0598a87af552f4e76f40249d755c24d661a5e Mon Sep 17 00:00:00 2001 From: Torsten Grote <t@grobox.de> Date: Wed, 16 May 2018 15:05:22 -0300 Subject: [PATCH] Use jessie-backports container as base image --- Dockerfile | 2 +- install-dependencies-verification.sh | 4 ++-- install-dependencies.sh | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 44051f0..09acf89 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:stretch +FROM debian:jessie-backports ENV LANG=C.UTF-8 ENV DEBIAN_FRONTEND=noninteractive diff --git a/install-dependencies-verification.sh b/install-dependencies-verification.sh index d9b3088..1539291 100755 --- a/install-dependencies-verification.sh +++ b/install-dependencies-verification.sh @@ -9,7 +9,7 @@ apt-get install -y --no-install-recommends \ libmagic1 # Install latest diffoscope (version in Debian stable is outdated) -pip3 install diffoscope +pip3 install diffoscope==83 # Install latest apktool for verification debugging wget --no-verbose https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_2.3.3.jar -O /opt/apktool.jar @@ -18,4 +18,4 @@ cat >/usr/local/bin/apktool <<EOF java -jar /opt/apktool.jar \$@ EOF chmod +x /usr/local/bin/apktool -mkdir -p /root/.local/share/apktool/framework \ No newline at end of file +mkdir -p /root/.local/share/apktool/framework diff --git a/install-dependencies.sh b/install-dependencies.sh index 4afd8b4..8f547cb 100755 --- a/install-dependencies.sh +++ b/install-dependencies.sh @@ -4,6 +4,8 @@ set -x apt-get install -y --no-install-recommends \ git \ - default-jdk-headless \ unzip \ wget + +apt-get install -y --no-install-recommends -t jessie-backports \ + openjdk-8-jdk-headless -- GitLab