Skip to content

Commit

Permalink
Switch to debian bullseye (#35)
Browse files Browse the repository at this point in the history
  • Loading branch information
OttoWinter authored Aug 23, 2021
1 parent 82d82b8 commit d5bc621
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 33 deletions.
16 changes: 8 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ RUN \
apt-get update \
# Use pinned versions so that we get updates with build caching
&& apt-get install -y --no-install-recommends \
python3=3.7.3-1 \
python3-pip=18.1-5 \
python3-setuptools=40.8.0-1 \
python3-pil=5.4.1-2+deb10u2 \
python3-cryptography=2.6.1-3+deb10u2 \
iputils-ping=3:20180629-2+deb10u2 \
git=1:2.20.1-2+deb10u3 \
curl=7.64.0-4+deb10u2 \
python3=3.9.2-3 \
python3-pip=20.3.4-4 \
python3-setuptools=52.0.0-4 \
python3-pil=8.1.2+dfsg-0.3 \
python3-cryptography=3.3.2-1 \
iputils-ping=3:20210202-1 \
git=1:2.30.2-1 \
curl=7.74.0-1.3+b1 \
&& rm -rf \
/tmp/* \
/var/{cache,log}/* \
Expand Down
18 changes: 9 additions & 9 deletions Dockerfile.hassio
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ RUN \
apt-get update \
# Use pinned versions so that we get updates with build caching
&& apt-get install -y --no-install-recommends \
python3=3.7.3-1 \
python3-pip=18.1-5 \
python3-setuptools=40.8.0-1 \
python3-pil=5.4.1-2+deb10u2 \
python3-cryptography=2.6.1-3+deb10u2 \
iputils-ping=3:20180629-2+deb10u2 \
git=1:2.20.1-2+deb10u3 \
curl=7.64.0-4+deb10u2 \
nginx=1.14.2-2+deb10u4 \
python3=3.9.2-3 \
python3-pip=20.3.4-4 \
python3-setuptools=52.0.0-4 \
python3-pil=8.1.2+dfsg-0.3 \
python3-cryptography=3.3.2-1 \
iputils-ping=3:20210202-1 \
git=1:2.30.2-1 \
curl=7.74.0-1.3+b1 \
nginx=1.18.0-6.1 \
&& rm -rf \
/tmp/* \
/var/{cache,log}/* \
Expand Down
20 changes: 7 additions & 13 deletions Dockerfile.lint
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,17 @@
ARG BUILD_FROM
FROM ${BUILD_FROM}

RUN \
echo 'deb http://deb.debian.org/debian buster-backports main' > \
/etc/apt/sources.list.d/backports.list

RUN \
apt-get update \
# Use pinned versions so that we get updates with build caching
&& apt-get install -y --no-install-recommends \
clang-format-7=1:7.0.1-8+deb10u2 \
clang-tidy-7=1:7.0.1-8+deb10u2 \
clang-format-11=1:11.0.1-2~bpo10+1 \
clang-tidy-11=1:11.0.1-2~bpo10+1 \
patch=2.7.6-3+deb10u1 \
software-properties-common=0.96.20.2-2 \
nano=3.2-3 \
build-essential=12.6 \
python3-dev=3.7.3-1 \
clang-format-11=1:11.0.1-2 \
clang-tidy-11=1:11.0.1-2 \
patch=2.7.6-7 \
software-properties-common=0.96.20.2-2.1 \
nano=5.4-2 \
build-essential=12.9 \
python3-dev=3.9.2-3 \
&& rm -rf \
/tmp/* \
/var/{cache,log}/* \
Expand Down
2 changes: 1 addition & 1 deletion NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ apt update
PKG=...
apt-cache show $PKG | grep 'Version: ' | sed -E 's/Version: (.*)/\1/' | head -1

for PKG in python3 python3-pip python3-setuptools python3-pil python3-cryptography iputils-ping git curl nginx clang-format-7 clang-tidy-7 clang-format-11 clang-tidy-11 patch software-properties-common nano build-essential python3-dev; do
for PKG in python3 python3-pip python3-setuptools python3-pil python3-cryptography iputils-ping git curl nginx clang-format-11 clang-tidy-11 patch software-properties-common nano build-essential python3-dev; do
vers=$(apt-cache show $PKG | grep 'Version: ' | sed -E 's/Version: (.*)/\1/' | head -1)
echo " $PKG=$vers \\"
done
Expand Down
4 changes: 2 additions & 2 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
TYPES = [TYPE_DOCKER, TYPE_HA_ADDON, TYPE_LINT]

BASE_IMAGES = {
TYPE_DOCKER: "{docker_arch}/debian:buster-20210511-slim",
TYPE_HA_ADDON: "ghcr.io/hassio-addons/debian-base/{arch}:4.2.1",
TYPE_DOCKER: "{docker_arch}/debian:bullseye-20210816-slim",
TYPE_HA_ADDON: "ghcr.io/hassio-addons/debian-base/{arch}:5.0.0",
TYPE_LINT: "esphome/esphome-base-{arch}:{tag}",
}

Expand Down

0 comments on commit d5bc621

Please sign in to comment.