From 65abb9004987be585a82782606d4ca13a1eda996 Mon Sep 17 00:00:00 2001 From: Sander van Grieken Date: Mon, 27 Feb 2023 11:16:04 +0100 Subject: [PATCH] build: update build container base image versions, update apt sources to current --- contrib/android/Dockerfile | 2 +- contrib/android/apt.sources.list | 4 ++-- contrib/build-linux/appimage/Dockerfile | 2 +- contrib/build-linux/appimage/apt.sources.list | 4 ++-- contrib/build-linux/sdist/Dockerfile | 2 +- contrib/build-wine/Dockerfile | 2 +- contrib/build-wine/apt.sources.list | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/contrib/android/Dockerfile b/contrib/android/Dockerfile index 0c1edb37a..04d2e74eb 100644 --- a/contrib/android/Dockerfile +++ b/contrib/android/Dockerfile @@ -1,6 +1,6 @@ # based on https://github.com/kivy/python-for-android/blob/master/Dockerfile -FROM debian:bullseye@sha256:bfe6615d017d1eebe19f349669de58cda36c668ef916e618be78071513c690e5 +FROM debian:bullseye@sha256:43ef0c6c3585d5b406caa7a0f232ff5a19c1402aeb415f68bcd1cf9d10180af8 ENV DEBIAN_FRONTEND=noninteractive diff --git a/contrib/android/apt.sources.list b/contrib/android/apt.sources.list index b5b939218..fe4030017 100644 --- a/contrib/android/apt.sources.list +++ b/contrib/android/apt.sources.list @@ -1,2 +1,2 @@ -deb https://snapshot.debian.org/archive/debian/20221106T031548Z/ bullseye main non-free contrib -deb-src https://snapshot.debian.org/archive/debian/20221106T031548Z/ bullseye main non-free contrib +deb https://snapshot.debian.org/archive/debian/20230226T090712Z/ bullseye main non-free contrib +deb-src https://snapshot.debian.org/archive/debian/20230226T090712Z/ bullseye main non-free contrib diff --git a/contrib/build-linux/appimage/Dockerfile b/contrib/build-linux/appimage/Dockerfile index df80315e9..e92b6eb0d 100644 --- a/contrib/build-linux/appimage/Dockerfile +++ b/contrib/build-linux/appimage/Dockerfile @@ -2,7 +2,7 @@ # from https://docs.appimage.org/introduction/concepts.html : # "[AppImages] should be built on the oldest possible system, allowing them to run on newer system[s]" -FROM debian:buster@sha256:e83854c9fb469daa7273d73c43a3fe5ae2da77cb40d3d34282a9af09a9db49f9 +FROM debian:buster@sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459 ENV LC_ALL=C.UTF-8 LANG=C.UTF-8 ENV DEBIAN_FRONTEND=noninteractive diff --git a/contrib/build-linux/appimage/apt.sources.list b/contrib/build-linux/appimage/apt.sources.list index e202948aa..e19552491 100644 --- a/contrib/build-linux/appimage/apt.sources.list +++ b/contrib/build-linux/appimage/apt.sources.list @@ -1,2 +1,2 @@ -deb https://snapshot.debian.org/archive/debian/20221106T031548Z/ buster main non-free contrib -deb-src https://snapshot.debian.org/archive/debian/20221106T031548Z/ buster main non-free contrib +deb https://snapshot.debian.org/archive/debian/20230226T090712Z/ buster main non-free contrib +deb-src https://snapshot.debian.org/archive/debian/20230226T090712Z/ buster main non-free contrib diff --git a/contrib/build-linux/sdist/Dockerfile b/contrib/build-linux/sdist/Dockerfile index f1df96e42..2caf62cf7 100644 --- a/contrib/build-linux/sdist/Dockerfile +++ b/contrib/build-linux/sdist/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye@sha256:bfe6615d017d1eebe19f349669de58cda36c668ef916e618be78071513c690e5 +FROM debian:bullseye@sha256:43ef0c6c3585d5b406caa7a0f232ff5a19c1402aeb415f68bcd1cf9d10180af8 ENV LC_ALL=C.UTF-8 LANG=C.UTF-8 ENV DEBIAN_FRONTEND=noninteractive diff --git a/contrib/build-wine/Dockerfile b/contrib/build-wine/Dockerfile index fd7441435..deb28e114 100644 --- a/contrib/build-wine/Dockerfile +++ b/contrib/build-wine/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye@sha256:bfe6615d017d1eebe19f349669de58cda36c668ef916e618be78071513c690e5 +FROM debian:bullseye@sha256:43ef0c6c3585d5b406caa7a0f232ff5a19c1402aeb415f68bcd1cf9d10180af8 # need ca-certificates before using snapshot packages RUN apt update -qq > /dev/null && apt install -qq --yes --no-install-recommends \ diff --git a/contrib/build-wine/apt.sources.list b/contrib/build-wine/apt.sources.list index b5b939218..fe4030017 100644 --- a/contrib/build-wine/apt.sources.list +++ b/contrib/build-wine/apt.sources.list @@ -1,2 +1,2 @@ -deb https://snapshot.debian.org/archive/debian/20221106T031548Z/ bullseye main non-free contrib -deb-src https://snapshot.debian.org/archive/debian/20221106T031548Z/ bullseye main non-free contrib +deb https://snapshot.debian.org/archive/debian/20230226T090712Z/ bullseye main non-free contrib +deb-src https://snapshot.debian.org/archive/debian/20230226T090712Z/ bullseye main non-free contrib