Browse Source

add apt --allow-downgrades in more places.

build sdist also from debian bullseye container
patch-4
Sander van Grieken 2 years ago
parent
commit
acde8cd0b7
  1. 11
      contrib/android/Dockerfile
  2. 2
      contrib/build-linux/sdist/Dockerfile
  3. 2
      contrib/build-wine/Dockerfile

11
contrib/android/Dockerfile

@ -15,7 +15,7 @@ COPY contrib/android/apt.sources.list /etc/apt/sources.list
COPY contrib/android/apt.preferences /etc/apt/preferences.d/snapshot
# configure locale
RUN apt update -qq > /dev/null && apt install -qq --yes --no-install-recommends \
RUN apt update -qq > /dev/null && apt install -qq --yes --no-install-recommends --allow-downgrades \
locales && \
locale-gen en_US.UTF-8
ENV LANG="en_US.UTF-8" \
@ -23,7 +23,10 @@ ENV LANG="en_US.UTF-8" \
LC_ALL="en_US.UTF-8"
RUN apt -y update -qq \
&& apt -y install -qq --no-install-recommends curl unzip ca-certificates \
&& apt -y install -qq --no-install-recommends --allow-downgrades \
curl \
unzip \
ca-certificates \
&& apt -y autoremove
@ -73,7 +76,7 @@ RUN mkdir --parents "${ANDROID_SDK_HOME}/.android/" \
# accept Android licenses (JDK necessary!)
RUN apt -y update -qq \
&& apt -y install -qq --no-install-recommends \
&& apt -y install -qq --no-install-recommends --allow-downgrades \
openjdk-11-jdk-headless \
&& apt -y autoremove
RUN yes | ${ANDROID_SDK_MANAGER} --licenses > /dev/null
@ -104,7 +107,7 @@ RUN curl --location --progress-bar \
# install system/build dependencies
# https://github.com/kivy/buildozer/blob/master/docs/source/installation.rst#android-on-ubuntu-2004-64bit
RUN apt -y update -qq \
&& apt -y install -qq --no-install-recommends \
&& apt -y install -qq --no-install-recommends --allow-downgrades \
python3 \
python3-dev \
python3-pip \

2
contrib/build-linux/sdist/Dockerfile

@ -1,4 +1,4 @@
FROM ubuntu:20.04@sha256:5747316366b8cc9e3021cd7286f42b2d6d81e3d743e2ab571f55bcd5df788cc8
FROM debian:bullseye@sha256:bfe6615d017d1eebe19f349669de58cda36c668ef916e618be78071513c690e5
ENV LC_ALL=C.UTF-8 LANG=C.UTF-8
ENV DEBIAN_FRONTEND=noninteractive

2
contrib/build-wine/Dockerfile

@ -13,7 +13,7 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN dpkg --add-architecture i386 && \
apt-get update -q && \
apt-get install -qy \
apt-get install -qy --allow-downgrades \
wget \
gnupg2 \
dirmngr \

Loading…
Cancel
Save