Commit a911dbbd authored by akwizgran's avatar akwizgran

Upgrade to Debian 10 to get Debian's diffoscope and apktool packages.

parent 22d47c01
Pipeline #3880 passed with stages
in 12 minutes and 3 seconds
FROM debian:stretch
FROM debian:buster
ENV LANG=C.UTF-8
ENV DEBIAN_FRONTEND=noninteractive
......
......@@ -90,6 +90,8 @@ You can find a list of tags in Briar's
The `SYS_ADMIN` capability and the `fuse` device are required,
so the container can build the app inside a `disorderfs` which shuffles the filesystem.
If the build fails with `fuse: mount failed: Permission denied`, you may need to add the argument `--security-opt apparmor:unconfined` to the Docker command.
## Historical Changes
* Before version `1.1.7`, Briar needed a deterministic files system
......
......@@ -3,19 +3,5 @@ set -e
set -x
apt-get install -y --no-install-recommends \
enjarify \
python3-pip python3-setuptools python3-wheel \
python3-libarchive-c \
libmagic1
# Install latest diffoscope (version in Debian stable is outdated)
pip3 install diffoscope
# Install latest apktool for verification debugging
wget --no-verbose https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_2.3.3.jar -O /opt/apktool.jar
cat >/usr/local/bin/apktool <<EOF
#!/usr/bin/env bash
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
diffoscope \
apktool
......@@ -4,7 +4,7 @@ set -x
apt-get install -y --no-install-recommends \
git \
default-jdk-headless \
openjdk-8-jdk-headless \
fuse \
disorderfs \
unzip \
......
......@@ -2,6 +2,9 @@
set -e
set -x
# allow OpenJDK 8 to be installed from the oldstable repo
echo 'deb http://deb.debian.org/debian/ stretch main' >> /etc/apt/sources.list
# update package sources
apt-get update
apt-get -y upgrade
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment