From cd689b8a25307f0f177158b835261436e3b0772f Mon Sep 17 00:00:00 2001 From: john30 Date: Sat, 9 Oct 2021 11:32:03 +0200 Subject: [PATCH] remove stretch and add bullseye (default) --- contrib/docker/Dockerfile | 4 ++-- contrib/docker/Dockerfile.arm32v5 | 4 ++-- contrib/docker/Dockerfile.arm32v7 | 4 ++-- contrib/docker/Dockerfile.arm64v8 | 4 ++-- contrib/docker/Dockerfile.i386 | 4 ++-- contrib/docker/Dockerfile.release | 4 ++-- contrib/docker/Dockerfile.release.arm32v5 | 4 ++-- contrib/docker/Dockerfile.release.arm32v7 | 4 ++-- contrib/docker/Dockerfile.release.arm64v8 | 4 ++-- contrib/docker/Dockerfile.release.i386 | 4 ++-- contrib/docker/build.sh | 2 +- contrib/docker/update.sh | 2 +- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile index b844758e2..83548677d 100755 --- a/contrib/docker/Dockerfile +++ b/contrib/docker/Dockerfile @@ -1,5 +1,5 @@ -FROM debian:stretch as build +FROM debian:bullseye as build RUN apt-get update && apt-get install -y \ libmosquitto-dev libstdc++6 libc6 libgcc1 \ @@ -18,7 +18,7 @@ RUN git clone https://github.com/john30/ebusd.git /build \ -FROM debian:stretch-slim +FROM debian:bullseye-slim RUN apt-get update && apt-get install -y \ logrotate libmosquitto1 libstdc++6 libc6 libgcc1 \ diff --git a/contrib/docker/Dockerfile.arm32v5 b/contrib/docker/Dockerfile.arm32v5 index f640046e9..40c484bdd 100644 --- a/contrib/docker/Dockerfile.arm32v5 +++ b/contrib/docker/Dockerfile.arm32v5 @@ -1,5 +1,5 @@ FROM multiarch/qemu-user-static as qemu -FROM arm32v5/debian:stretch as build +FROM arm32v5/debian:bullseye as build COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin/ RUN apt-get update && apt-get install -y \ libmosquitto-dev libstdc++6 libc6 libgcc1 \ @@ -18,7 +18,7 @@ RUN git clone https://github.com/john30/ebusd.git /build \ -FROM arm32v5/debian:stretch-slim +FROM arm32v5/debian:bullseye-slim COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin/ RUN apt-get update && apt-get install -y \ logrotate libmosquitto1 libstdc++6 libc6 libgcc1 \ diff --git a/contrib/docker/Dockerfile.arm32v7 b/contrib/docker/Dockerfile.arm32v7 index 62748c144..832212f17 100644 --- a/contrib/docker/Dockerfile.arm32v7 +++ b/contrib/docker/Dockerfile.arm32v7 @@ -1,5 +1,5 @@ FROM multiarch/qemu-user-static as qemu -FROM arm32v7/debian:stretch as build +FROM arm32v7/debian:bullseye as build COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin/ RUN apt-get update && apt-get install -y \ libmosquitto-dev libstdc++6 libc6 libgcc1 \ @@ -18,7 +18,7 @@ RUN git clone https://github.com/john30/ebusd.git /build \ -FROM arm32v7/debian:stretch-slim +FROM arm32v7/debian:bullseye-slim COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin/ RUN apt-get update && apt-get install -y \ logrotate libmosquitto1 libstdc++6 libc6 libgcc1 \ diff --git a/contrib/docker/Dockerfile.arm64v8 b/contrib/docker/Dockerfile.arm64v8 index da486fa2f..29b0924bd 100644 --- a/contrib/docker/Dockerfile.arm64v8 +++ b/contrib/docker/Dockerfile.arm64v8 @@ -1,5 +1,5 @@ FROM multiarch/qemu-user-static as qemu -FROM arm64v8/debian:stretch as build +FROM arm64v8/debian:bullseye as build COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin/ RUN apt-get update && apt-get install -y \ libmosquitto-dev libstdc++6 libc6 libgcc1 \ @@ -18,7 +18,7 @@ RUN git clone https://github.com/john30/ebusd.git /build \ -FROM arm64v8/debian:stretch-slim +FROM arm64v8/debian:bullseye-slim COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin/ RUN apt-get update && apt-get install -y \ logrotate libmosquitto1 libstdc++6 libc6 libgcc1 \ diff --git a/contrib/docker/Dockerfile.i386 b/contrib/docker/Dockerfile.i386 index eeae6a739..968bf03ca 100644 --- a/contrib/docker/Dockerfile.i386 +++ b/contrib/docker/Dockerfile.i386 @@ -1,5 +1,5 @@ FROM multiarch/qemu-user-static as qemu -FROM i386/debian:stretch as build +FROM i386/debian:bullseye as build COPY --from=qemu /usr/bin/qemu-i386-static /usr/bin/ RUN apt-get update && apt-get install -y \ libmosquitto-dev libstdc++6 libc6 libgcc1 \ @@ -18,7 +18,7 @@ RUN git clone https://github.com/john30/ebusd.git /build \ -FROM i386/debian:stretch-slim +FROM i386/debian:bullseye-slim COPY --from=qemu /usr/bin/qemu-i386-static /usr/bin/ RUN apt-get update && apt-get install -y \ logrotate libmosquitto1 libstdc++6 libc6 libgcc1 \ diff --git a/contrib/docker/Dockerfile.release b/contrib/docker/Dockerfile.release index 9c5c09534..8e94afb8b 100644 --- a/contrib/docker/Dockerfile.release +++ b/contrib/docker/Dockerfile.release @@ -1,5 +1,5 @@ -FROM debian:stretch as build +FROM debian:bullseye as build RUN apt-get update && apt-get install -y \ libmosquitto-dev libstdc++6 libc6 libgcc1 \ @@ -18,7 +18,7 @@ RUN git clone https://github.com/john30/ebusd.git /build \ -FROM debian:stretch-slim +FROM debian:bullseye-slim RUN apt-get update && apt-get install -y \ logrotate libmosquitto1 libstdc++6 libc6 libgcc1 \ diff --git a/contrib/docker/Dockerfile.release.arm32v5 b/contrib/docker/Dockerfile.release.arm32v5 index 1c2326951..679797108 100644 --- a/contrib/docker/Dockerfile.release.arm32v5 +++ b/contrib/docker/Dockerfile.release.arm32v5 @@ -1,5 +1,5 @@ FROM multiarch/qemu-user-static as qemu -FROM arm32v5/debian:stretch as build +FROM arm32v5/debian:bullseye as build COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin/ RUN apt-get update && apt-get install -y \ libmosquitto-dev libstdc++6 libc6 libgcc1 \ @@ -18,7 +18,7 @@ RUN git clone https://github.com/john30/ebusd.git /build \ -FROM arm32v5/debian:stretch-slim +FROM arm32v5/debian:bullseye-slim COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin/ RUN apt-get update && apt-get install -y \ logrotate libmosquitto1 libstdc++6 libc6 libgcc1 \ diff --git a/contrib/docker/Dockerfile.release.arm32v7 b/contrib/docker/Dockerfile.release.arm32v7 index 64b2d3d22..733f26ced 100644 --- a/contrib/docker/Dockerfile.release.arm32v7 +++ b/contrib/docker/Dockerfile.release.arm32v7 @@ -1,5 +1,5 @@ FROM multiarch/qemu-user-static as qemu -FROM arm32v7/debian:stretch as build +FROM arm32v7/debian:bullseye as build COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin/ RUN apt-get update && apt-get install -y \ libmosquitto-dev libstdc++6 libc6 libgcc1 \ @@ -18,7 +18,7 @@ RUN git clone https://github.com/john30/ebusd.git /build \ -FROM arm32v7/debian:stretch-slim +FROM arm32v7/debian:bullseye-slim COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin/ RUN apt-get update && apt-get install -y \ logrotate libmosquitto1 libstdc++6 libc6 libgcc1 \ diff --git a/contrib/docker/Dockerfile.release.arm64v8 b/contrib/docker/Dockerfile.release.arm64v8 index f96cb4e22..a9519e56f 100644 --- a/contrib/docker/Dockerfile.release.arm64v8 +++ b/contrib/docker/Dockerfile.release.arm64v8 @@ -1,5 +1,5 @@ FROM multiarch/qemu-user-static as qemu -FROM arm64v8/debian:stretch as build +FROM arm64v8/debian:bullseye as build COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin/ RUN apt-get update && apt-get install -y \ libmosquitto-dev libstdc++6 libc6 libgcc1 \ @@ -18,7 +18,7 @@ RUN git clone https://github.com/john30/ebusd.git /build \ -FROM arm64v8/debian:stretch-slim +FROM arm64v8/debian:bullseye-slim COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin/ RUN apt-get update && apt-get install -y \ logrotate libmosquitto1 libstdc++6 libc6 libgcc1 \ diff --git a/contrib/docker/Dockerfile.release.i386 b/contrib/docker/Dockerfile.release.i386 index 8824abe69..a2a0de05e 100644 --- a/contrib/docker/Dockerfile.release.i386 +++ b/contrib/docker/Dockerfile.release.i386 @@ -1,5 +1,5 @@ FROM multiarch/qemu-user-static as qemu -FROM i386/debian:stretch as build +FROM i386/debian:bullseye as build COPY --from=qemu /usr/bin/qemu-i386-static /usr/bin/ RUN apt-get update && apt-get install -y \ libmosquitto-dev libstdc++6 libc6 libgcc1 \ @@ -18,7 +18,7 @@ RUN git clone https://github.com/john30/ebusd.git /build \ -FROM i386/debian:stretch-slim +FROM i386/debian:bullseye-slim COPY --from=qemu /usr/bin/qemu-i386-static /usr/bin/ RUN apt-get update && apt-get install -y \ logrotate libmosquitto1 libstdc++6 libc6 libgcc1 \ diff --git a/contrib/docker/build.sh b/contrib/docker/build.sh index 7bd244751..94519dc1c 100755 --- a/contrib/docker/build.sh +++ b/contrib/docker/build.sh @@ -1,6 +1,6 @@ #!/bin/bash archs='amd64 i386 arm32v5 arm32v7 arm64v8' -images='jessie stretch buster' +images='stretch buster bullseye' UPLOAD_URL='http://'`hostname`'/ebusdreleaseupload.php' UPLOAD_CREDENTIALS='anonymous:build' for image in $images; do diff --git a/contrib/docker/update.sh b/contrib/docker/update.sh index c10adbe27..e78d48306 100755 --- a/contrib/docker/update.sh +++ b/contrib/docker/update.sh @@ -1,5 +1,5 @@ #!/bin/bash -DEFAULT_IMAGE=debian:stretch +DEFAULT_IMAGE=debian:bullseye EBUSD_VERSION=`cat ../../VERSION` archs='amd64 i386 arm32v5:arm arm32v7:arm arm64v8:aarch64'