From e92918df1e2576efde750903ec9686cc82b562a1 Mon Sep 17 00:00:00 2001 From: sergioisidoro Date: Sun, 22 Dec 2019 01:46:22 +0200 Subject: [PATCH 1/8] Support for socket AF_BLUETOOTH --- Dockerfile-alpine.template | 1 + Dockerfile-caveman-alpine.template | 1 + Dockerfile-caveman-debian.template | 1 + Dockerfile-caveman-slim.template | 1 + Dockerfile-debian.template | 1 + Dockerfile-slim.template | 1 + 6 files changed, 6 insertions(+) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 351e6b04b..1c260aed4 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -56,6 +56,7 @@ RUN set -ex \ util-linux-dev \ xz-dev \ zlib-dev \ + bluez-dev \ # add build deps before removing fetch deps in case there's overlap && apk del --no-network .fetch-deps \ \ diff --git a/Dockerfile-caveman-alpine.template b/Dockerfile-caveman-alpine.template index 101063a01..af013b6e6 100644 --- a/Dockerfile-caveman-alpine.template +++ b/Dockerfile-caveman-alpine.template @@ -56,6 +56,7 @@ RUN set -ex \ tk \ tk-dev \ zlib-dev \ + bluez-dev \ # add build deps before removing fetch deps in case there's overlap && apk del .fetch-deps \ \ diff --git a/Dockerfile-caveman-debian.template b/Dockerfile-caveman-debian.template index 19069ed59..55c79a8fc 100644 --- a/Dockerfile-caveman-debian.template +++ b/Dockerfile-caveman-debian.template @@ -12,6 +12,7 @@ ENV PYTHONIOENCODING UTF-8 # extra dependencies (over what buildpack-deps already includes) RUN apt-get update && apt-get install -y --no-install-recommends \ tk-dev \ + bluez-dev \ && rm -rf /var/lib/apt/lists/* ENV GPG_KEY %%PLACEHOLDER%% diff --git a/Dockerfile-caveman-slim.template b/Dockerfile-caveman-slim.template index 075cdc8df..a2f8cc102 100644 --- a/Dockerfile-caveman-slim.template +++ b/Dockerfile-caveman-slim.template @@ -13,6 +13,7 @@ ENV PYTHONIOENCODING UTF-8 RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates \ netbase \ + bluez-dev \ && rm -rf /var/lib/apt/lists/* ENV GPG_KEY %%PLACEHOLDER%% diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 4d56b25cf..3a07f9631 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -13,6 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libssl-dev \ tk-dev \ uuid-dev \ + bluez-dev \ && rm -rf /var/lib/apt/lists/* ENV GPG_KEY %%PLACEHOLDER%% diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 91e12a58c..8e1b9d2d9 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -38,6 +38,7 @@ RUN set -ex \ wget \ xz-utils \ zlib1g-dev \ + bluez-dev \ # as of Stretch, "gpg" is no longer included by default $(command -v gpg > /dev/null || echo 'gnupg dirmngr') \ \ From a23b410b345d215375f4690f55ccc3ec3c0e98db Mon Sep 17 00:00:00 2001 From: sergioisidoro Date: Sun, 22 Dec 2019 02:25:25 +0200 Subject: [PATCH 2/8] Use libbluetooth-dev in debian images --- Dockerfile-caveman-debian.template | 2 +- Dockerfile-caveman-slim.template | 2 +- Dockerfile-debian.template | 2 +- Dockerfile-slim.template | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile-caveman-debian.template b/Dockerfile-caveman-debian.template index 55c79a8fc..dbff5423e 100644 --- a/Dockerfile-caveman-debian.template +++ b/Dockerfile-caveman-debian.template @@ -12,7 +12,7 @@ ENV PYTHONIOENCODING UTF-8 # extra dependencies (over what buildpack-deps already includes) RUN apt-get update && apt-get install -y --no-install-recommends \ tk-dev \ - bluez-dev \ + libbluetooth-dev \ && rm -rf /var/lib/apt/lists/* ENV GPG_KEY %%PLACEHOLDER%% diff --git a/Dockerfile-caveman-slim.template b/Dockerfile-caveman-slim.template index a2f8cc102..cc4105e0d 100644 --- a/Dockerfile-caveman-slim.template +++ b/Dockerfile-caveman-slim.template @@ -13,7 +13,7 @@ ENV PYTHONIOENCODING UTF-8 RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates \ netbase \ - bluez-dev \ + libbluetooth-dev \ && rm -rf /var/lib/apt/lists/* ENV GPG_KEY %%PLACEHOLDER%% diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 3a07f9631..cfb71a653 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libssl-dev \ tk-dev \ uuid-dev \ - bluez-dev \ + libbluetooth-dev \ && rm -rf /var/lib/apt/lists/* ENV GPG_KEY %%PLACEHOLDER%% diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 8e1b9d2d9..49408f594 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -38,7 +38,7 @@ RUN set -ex \ wget \ xz-utils \ zlib1g-dev \ - bluez-dev \ + libbluetooth-dev \ # as of Stretch, "gpg" is no longer included by default $(command -v gpg > /dev/null || echo 'gnupg dirmngr') \ \ From 10a373690b76c9036ff5aedd7dfb4769563ac49d Mon Sep 17 00:00:00 2001 From: sergioisidoro Date: Wed, 25 Dec 2019 20:46:24 +0200 Subject: [PATCH 3/8] Remove caveman deps (not needed) --- Dockerfile-caveman-alpine.template | 1 - Dockerfile-caveman-debian.template | 1 - Dockerfile-caveman-slim.template | 1 - 3 files changed, 3 deletions(-) diff --git a/Dockerfile-caveman-alpine.template b/Dockerfile-caveman-alpine.template index af013b6e6..101063a01 100644 --- a/Dockerfile-caveman-alpine.template +++ b/Dockerfile-caveman-alpine.template @@ -56,7 +56,6 @@ RUN set -ex \ tk \ tk-dev \ zlib-dev \ - bluez-dev \ # add build deps before removing fetch deps in case there's overlap && apk del .fetch-deps \ \ diff --git a/Dockerfile-caveman-debian.template b/Dockerfile-caveman-debian.template index dbff5423e..19069ed59 100644 --- a/Dockerfile-caveman-debian.template +++ b/Dockerfile-caveman-debian.template @@ -12,7 +12,6 @@ ENV PYTHONIOENCODING UTF-8 # extra dependencies (over what buildpack-deps already includes) RUN apt-get update && apt-get install -y --no-install-recommends \ tk-dev \ - libbluetooth-dev \ && rm -rf /var/lib/apt/lists/* ENV GPG_KEY %%PLACEHOLDER%% diff --git a/Dockerfile-caveman-slim.template b/Dockerfile-caveman-slim.template index cc4105e0d..075cdc8df 100644 --- a/Dockerfile-caveman-slim.template +++ b/Dockerfile-caveman-slim.template @@ -13,7 +13,6 @@ ENV PYTHONIOENCODING UTF-8 RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates \ netbase \ - libbluetooth-dev \ && rm -rf /var/lib/apt/lists/* ENV GPG_KEY %%PLACEHOLDER%% From 7044dac1d65833612794482b1ab4ceae73be07d0 Mon Sep 17 00:00:00 2001 From: sergioisidoro Date: Wed, 25 Dec 2019 20:54:04 +0200 Subject: [PATCH 4/8] Sort deps --- Dockerfile-alpine.template | 2 +- Dockerfile-debian.template | 2 +- Dockerfile-slim.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 1c260aed4..6296ad5db 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -32,6 +32,7 @@ RUN set -ex \ && rm python.tar.xz \ \ && apk add --no-cache --virtual .build-deps \ + bluez-dev \ bzip2-dev \ coreutils \ dpkg-dev dpkg \ @@ -56,7 +57,6 @@ RUN set -ex \ util-linux-dev \ xz-dev \ zlib-dev \ - bluez-dev \ # add build deps before removing fetch deps in case there's overlap && apk del --no-network .fetch-deps \ \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index cfb71a653..8ddf9a673 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -10,10 +10,10 @@ ENV LANG C.UTF-8 # extra dependencies (over what buildpack-deps already includes) RUN apt-get update && apt-get install -y --no-install-recommends \ # Python 3.4 on Stretch+ needs to use an older version of "libssl-dev" (these lines both get removed for every other combination) + libbluetooth-dev \ libssl-dev \ tk-dev \ uuid-dev \ - libbluetooth-dev \ && rm -rf /var/lib/apt/lists/* ENV GPG_KEY %%PLACEHOLDER%% diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 49408f594..84b4d87d9 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -20,6 +20,7 @@ RUN set -ex \ \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update && apt-get install -y --no-install-recommends \ + bluez-dev \ dpkg-dev \ gcc \ libbz2-dev \ @@ -38,7 +39,6 @@ RUN set -ex \ wget \ xz-utils \ zlib1g-dev \ - libbluetooth-dev \ # as of Stretch, "gpg" is no longer included by default $(command -v gpg > /dev/null || echo 'gnupg dirmngr') \ \ From a02c43cdf481ceb31ca89df4997be91385a5fdc9 Mon Sep 17 00:00:00 2001 From: sergioisidoro Date: Wed, 25 Dec 2019 21:00:58 +0200 Subject: [PATCH 5/8] Move libbluetooth-dev out of runtime deps --- Dockerfile-debian.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 8ddf9a673..86a3159c9 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -10,7 +10,6 @@ ENV LANG C.UTF-8 # extra dependencies (over what buildpack-deps already includes) RUN apt-get update && apt-get install -y --no-install-recommends \ # Python 3.4 on Stretch+ needs to use an older version of "libssl-dev" (these lines both get removed for every other combination) - libbluetooth-dev \ libssl-dev \ tk-dev \ uuid-dev \ @@ -21,6 +20,7 @@ ENV PYTHON_VERSION %%PLACEHOLDER%% RUN set -ex \ \ + && apt-get update && apt-get install -y --no-install-recommends libbluetooth-dev \ && wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \ && wget -O python.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \ && export GNUPGHOME="$(mktemp -d)" \ From 2eaf8c2112f71ae349443e9e0777dce3cfc13131 Mon Sep 17 00:00:00 2001 From: sergioisidoro Date: Wed, 25 Dec 2019 22:15:07 +0200 Subject: [PATCH 6/8] Fix mishap --- Dockerfile-slim.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 84b4d87d9..3d0c35933 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -20,9 +20,9 @@ RUN set -ex \ \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update && apt-get install -y --no-install-recommends \ - bluez-dev \ dpkg-dev \ gcc \ + libbluetooth-dev \ libbz2-dev \ libc6-dev \ libexpat1-dev \ From 7d934af75eeb38b641083865b5bd0a8ede5fdcf1 Mon Sep 17 00:00:00 2001 From: sergioisidoro Date: Tue, 31 Dec 2019 10:13:12 +0200 Subject: [PATCH 7/8] Revert debian change --- Dockerfile-debian.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 86a3159c9..fb9546004 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -9,7 +9,8 @@ ENV LANG C.UTF-8 # extra dependencies (over what buildpack-deps already includes) RUN apt-get update && apt-get install -y --no-install-recommends \ -# Python 3.4 on Stretch+ needs to use an older version of "libssl-dev" (these lines both get removed for every other combination) + libbluetooth-dev \ + # Python 3.4 on Stretch+ needs to use an older version of "libssl-dev" (these lines both get removed for every other combination) libssl-dev \ tk-dev \ uuid-dev \ @@ -20,7 +21,6 @@ ENV PYTHON_VERSION %%PLACEHOLDER%% RUN set -ex \ \ - && apt-get update && apt-get install -y --no-install-recommends libbluetooth-dev \ && wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \ && wget -O python.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \ && export GNUPGHOME="$(mktemp -d)" \ From d2a2b4f7422aac78c7d5ea6aadc49d009d184a5f Mon Sep 17 00:00:00 2001 From: sergioisidoro Date: Tue, 31 Dec 2019 10:34:42 +0200 Subject: [PATCH 8/8] Run update.sh --- 3.5/alpine3.10/Dockerfile | 1 + 3.5/alpine3.11/Dockerfile | 1 + 3.5/buster/Dockerfile | 1 + 3.5/buster/slim/Dockerfile | 1 + 3.5/stretch/Dockerfile | 1 + 3.5/stretch/slim/Dockerfile | 1 + 3.6/alpine3.10/Dockerfile | 1 + 3.6/alpine3.11/Dockerfile | 1 + 3.6/buster/Dockerfile | 1 + 3.6/buster/slim/Dockerfile | 1 + 3.6/stretch/Dockerfile | 1 + 3.6/stretch/slim/Dockerfile | 1 + 3.7/alpine3.10/Dockerfile | 1 + 3.7/alpine3.11/Dockerfile | 1 + 3.7/buster/Dockerfile | 1 + 3.7/buster/slim/Dockerfile | 1 + 3.7/stretch/Dockerfile | 1 + 3.7/stretch/slim/Dockerfile | 1 + 3.8/alpine3.10/Dockerfile | 1 + 3.8/alpine3.11/Dockerfile | 1 + 3.8/buster/Dockerfile | 1 + 3.8/buster/slim/Dockerfile | 1 + 3.9-rc/alpine3.10/Dockerfile | 1 + 3.9-rc/buster/Dockerfile | 1 + 24 files changed, 24 insertions(+) diff --git a/3.5/alpine3.10/Dockerfile b/3.5/alpine3.10/Dockerfile index a4fda52dc..bdc4c78ef 100644 --- a/3.5/alpine3.10/Dockerfile +++ b/3.5/alpine3.10/Dockerfile @@ -38,6 +38,7 @@ RUN set -ex \ && rm python.tar.xz \ \ && apk add --no-cache --virtual .build-deps \ + bluez-dev \ bzip2-dev \ coreutils \ dpkg-dev dpkg \ diff --git a/3.5/alpine3.11/Dockerfile b/3.5/alpine3.11/Dockerfile index 26df0dae4..58b087fc9 100644 --- a/3.5/alpine3.11/Dockerfile +++ b/3.5/alpine3.11/Dockerfile @@ -38,6 +38,7 @@ RUN set -ex \ && rm python.tar.xz \ \ && apk add --no-cache --virtual .build-deps \ + bluez-dev \ bzip2-dev \ coreutils \ dpkg-dev dpkg \ diff --git a/3.5/buster/Dockerfile b/3.5/buster/Dockerfile index 59663bb7f..408e42694 100644 --- a/3.5/buster/Dockerfile +++ b/3.5/buster/Dockerfile @@ -15,6 +15,7 @@ ENV LANG C.UTF-8 # extra dependencies (over what buildpack-deps already includes) RUN apt-get update && apt-get install -y --no-install-recommends \ + libbluetooth-dev \ tk-dev \ && rm -rf /var/lib/apt/lists/* diff --git a/3.5/buster/slim/Dockerfile b/3.5/buster/slim/Dockerfile index 0bbc634ae..6ae52a78e 100644 --- a/3.5/buster/slim/Dockerfile +++ b/3.5/buster/slim/Dockerfile @@ -28,6 +28,7 @@ RUN set -ex \ && apt-get update && apt-get install -y --no-install-recommends \ dpkg-dev \ gcc \ + libbluetooth-dev \ libbz2-dev \ libc6-dev \ libexpat1-dev \ diff --git a/3.5/stretch/Dockerfile b/3.5/stretch/Dockerfile index 4a441093f..cd9b1f955 100644 --- a/3.5/stretch/Dockerfile +++ b/3.5/stretch/Dockerfile @@ -15,6 +15,7 @@ ENV LANG C.UTF-8 # extra dependencies (over what buildpack-deps already includes) RUN apt-get update && apt-get install -y --no-install-recommends \ + libbluetooth-dev \ tk-dev \ && rm -rf /var/lib/apt/lists/* diff --git a/3.5/stretch/slim/Dockerfile b/3.5/stretch/slim/Dockerfile index c993f100f..836352fb0 100644 --- a/3.5/stretch/slim/Dockerfile +++ b/3.5/stretch/slim/Dockerfile @@ -28,6 +28,7 @@ RUN set -ex \ && apt-get update && apt-get install -y --no-install-recommends \ dpkg-dev \ gcc \ + libbluetooth-dev \ libbz2-dev \ libc6-dev \ libexpat1-dev \ diff --git a/3.6/alpine3.10/Dockerfile b/3.6/alpine3.10/Dockerfile index 1fc43edc1..250494e78 100644 --- a/3.6/alpine3.10/Dockerfile +++ b/3.6/alpine3.10/Dockerfile @@ -38,6 +38,7 @@ RUN set -ex \ && rm python.tar.xz \ \ && apk add --no-cache --virtual .build-deps \ + bluez-dev \ bzip2-dev \ coreutils \ dpkg-dev dpkg \ diff --git a/3.6/alpine3.11/Dockerfile b/3.6/alpine3.11/Dockerfile index 02b804ae1..c546f4e10 100644 --- a/3.6/alpine3.11/Dockerfile +++ b/3.6/alpine3.11/Dockerfile @@ -38,6 +38,7 @@ RUN set -ex \ && rm python.tar.xz \ \ && apk add --no-cache --virtual .build-deps \ + bluez-dev \ bzip2-dev \ coreutils \ dpkg-dev dpkg \ diff --git a/3.6/buster/Dockerfile b/3.6/buster/Dockerfile index a05a07cee..24ba791eb 100644 --- a/3.6/buster/Dockerfile +++ b/3.6/buster/Dockerfile @@ -15,6 +15,7 @@ ENV LANG C.UTF-8 # extra dependencies (over what buildpack-deps already includes) RUN apt-get update && apt-get install -y --no-install-recommends \ + libbluetooth-dev \ tk-dev \ && rm -rf /var/lib/apt/lists/* diff --git a/3.6/buster/slim/Dockerfile b/3.6/buster/slim/Dockerfile index 33d68f894..0b64d68c7 100644 --- a/3.6/buster/slim/Dockerfile +++ b/3.6/buster/slim/Dockerfile @@ -28,6 +28,7 @@ RUN set -ex \ && apt-get update && apt-get install -y --no-install-recommends \ dpkg-dev \ gcc \ + libbluetooth-dev \ libbz2-dev \ libc6-dev \ libexpat1-dev \ diff --git a/3.6/stretch/Dockerfile b/3.6/stretch/Dockerfile index 9c292dde9..4077698b3 100644 --- a/3.6/stretch/Dockerfile +++ b/3.6/stretch/Dockerfile @@ -15,6 +15,7 @@ ENV LANG C.UTF-8 # extra dependencies (over what buildpack-deps already includes) RUN apt-get update && apt-get install -y --no-install-recommends \ + libbluetooth-dev \ tk-dev \ && rm -rf /var/lib/apt/lists/* diff --git a/3.6/stretch/slim/Dockerfile b/3.6/stretch/slim/Dockerfile index ca92ba8f4..cddf1032f 100644 --- a/3.6/stretch/slim/Dockerfile +++ b/3.6/stretch/slim/Dockerfile @@ -28,6 +28,7 @@ RUN set -ex \ && apt-get update && apt-get install -y --no-install-recommends \ dpkg-dev \ gcc \ + libbluetooth-dev \ libbz2-dev \ libc6-dev \ libexpat1-dev \ diff --git a/3.7/alpine3.10/Dockerfile b/3.7/alpine3.10/Dockerfile index a0f0febe0..87fdd9500 100644 --- a/3.7/alpine3.10/Dockerfile +++ b/3.7/alpine3.10/Dockerfile @@ -38,6 +38,7 @@ RUN set -ex \ && rm python.tar.xz \ \ && apk add --no-cache --virtual .build-deps \ + bluez-dev \ bzip2-dev \ coreutils \ dpkg-dev dpkg \ diff --git a/3.7/alpine3.11/Dockerfile b/3.7/alpine3.11/Dockerfile index b2b8f81f2..efdcb7adb 100644 --- a/3.7/alpine3.11/Dockerfile +++ b/3.7/alpine3.11/Dockerfile @@ -38,6 +38,7 @@ RUN set -ex \ && rm python.tar.xz \ \ && apk add --no-cache --virtual .build-deps \ + bluez-dev \ bzip2-dev \ coreutils \ dpkg-dev dpkg \ diff --git a/3.7/buster/Dockerfile b/3.7/buster/Dockerfile index 0019655c7..44cb0fd44 100644 --- a/3.7/buster/Dockerfile +++ b/3.7/buster/Dockerfile @@ -15,6 +15,7 @@ ENV LANG C.UTF-8 # extra dependencies (over what buildpack-deps already includes) RUN apt-get update && apt-get install -y --no-install-recommends \ + libbluetooth-dev \ tk-dev \ uuid-dev \ && rm -rf /var/lib/apt/lists/* diff --git a/3.7/buster/slim/Dockerfile b/3.7/buster/slim/Dockerfile index 9f7f6c267..50fb5b6dd 100644 --- a/3.7/buster/slim/Dockerfile +++ b/3.7/buster/slim/Dockerfile @@ -28,6 +28,7 @@ RUN set -ex \ && apt-get update && apt-get install -y --no-install-recommends \ dpkg-dev \ gcc \ + libbluetooth-dev \ libbz2-dev \ libc6-dev \ libexpat1-dev \ diff --git a/3.7/stretch/Dockerfile b/3.7/stretch/Dockerfile index f0d561d12..8e513a6b8 100644 --- a/3.7/stretch/Dockerfile +++ b/3.7/stretch/Dockerfile @@ -15,6 +15,7 @@ ENV LANG C.UTF-8 # extra dependencies (over what buildpack-deps already includes) RUN apt-get update && apt-get install -y --no-install-recommends \ + libbluetooth-dev \ tk-dev \ uuid-dev \ && rm -rf /var/lib/apt/lists/* diff --git a/3.7/stretch/slim/Dockerfile b/3.7/stretch/slim/Dockerfile index ae875dd6a..8bd14465a 100644 --- a/3.7/stretch/slim/Dockerfile +++ b/3.7/stretch/slim/Dockerfile @@ -28,6 +28,7 @@ RUN set -ex \ && apt-get update && apt-get install -y --no-install-recommends \ dpkg-dev \ gcc \ + libbluetooth-dev \ libbz2-dev \ libc6-dev \ libexpat1-dev \ diff --git a/3.8/alpine3.10/Dockerfile b/3.8/alpine3.10/Dockerfile index 901e2f977..9883af4cc 100644 --- a/3.8/alpine3.10/Dockerfile +++ b/3.8/alpine3.10/Dockerfile @@ -38,6 +38,7 @@ RUN set -ex \ && rm python.tar.xz \ \ && apk add --no-cache --virtual .build-deps \ + bluez-dev \ bzip2-dev \ coreutils \ dpkg-dev dpkg \ diff --git a/3.8/alpine3.11/Dockerfile b/3.8/alpine3.11/Dockerfile index 88367bd20..edd76e2d1 100644 --- a/3.8/alpine3.11/Dockerfile +++ b/3.8/alpine3.11/Dockerfile @@ -38,6 +38,7 @@ RUN set -ex \ && rm python.tar.xz \ \ && apk add --no-cache --virtual .build-deps \ + bluez-dev \ bzip2-dev \ coreutils \ dpkg-dev dpkg \ diff --git a/3.8/buster/Dockerfile b/3.8/buster/Dockerfile index f9747288c..07ec591f0 100644 --- a/3.8/buster/Dockerfile +++ b/3.8/buster/Dockerfile @@ -15,6 +15,7 @@ ENV LANG C.UTF-8 # extra dependencies (over what buildpack-deps already includes) RUN apt-get update && apt-get install -y --no-install-recommends \ + libbluetooth-dev \ tk-dev \ uuid-dev \ && rm -rf /var/lib/apt/lists/* diff --git a/3.8/buster/slim/Dockerfile b/3.8/buster/slim/Dockerfile index efdacf1a3..b503d10ed 100644 --- a/3.8/buster/slim/Dockerfile +++ b/3.8/buster/slim/Dockerfile @@ -28,6 +28,7 @@ RUN set -ex \ && apt-get update && apt-get install -y --no-install-recommends \ dpkg-dev \ gcc \ + libbluetooth-dev \ libbz2-dev \ libc6-dev \ libexpat1-dev \ diff --git a/3.9-rc/alpine3.10/Dockerfile b/3.9-rc/alpine3.10/Dockerfile index 3a7020759..7fde80b60 100644 --- a/3.9-rc/alpine3.10/Dockerfile +++ b/3.9-rc/alpine3.10/Dockerfile @@ -38,6 +38,7 @@ RUN set -ex \ && rm python.tar.xz \ \ && apk add --no-cache --virtual .build-deps \ + bluez-dev \ bzip2-dev \ coreutils \ dpkg-dev dpkg \ diff --git a/3.9-rc/buster/Dockerfile b/3.9-rc/buster/Dockerfile index 6c8059c2c..53c460bb8 100644 --- a/3.9-rc/buster/Dockerfile +++ b/3.9-rc/buster/Dockerfile @@ -15,6 +15,7 @@ ENV LANG C.UTF-8 # extra dependencies (over what buildpack-deps already includes) RUN apt-get update && apt-get install -y --no-install-recommends \ + libbluetooth-dev \ tk-dev \ uuid-dev \ && rm -rf /var/lib/apt/lists/*