Skip to content

Commit 7044dac

Browse files
author
sergioisidoro
committed
Sort deps
1 parent 10a3736 commit 7044dac

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Dockerfile-alpine.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ RUN set -ex \
3232
&& rm python.tar.xz \
3333
\
3434
&& apk add --no-cache --virtual .build-deps \
35+
bluez-dev \
3536
bzip2-dev \
3637
coreutils \
3738
dpkg-dev dpkg \
@@ -56,7 +57,6 @@ RUN set -ex \
5657
util-linux-dev \
5758
xz-dev \
5859
zlib-dev \
59-
bluez-dev \
6060
# add build deps before removing fetch deps in case there's overlap
6161
&& apk del --no-network .fetch-deps \
6262
\

Dockerfile-debian.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ ENV LANG C.UTF-8
1010
# extra dependencies (over what buildpack-deps already includes)
1111
RUN apt-get update && apt-get install -y --no-install-recommends \
1212
# Python 3.4 on Stretch+ needs to use an older version of "libssl-dev" (these lines both get removed for every other combination)
13+
libbluetooth-dev \
1314
libssl-dev \
1415
tk-dev \
1516
uuid-dev \
16-
libbluetooth-dev \
1717
&& rm -rf /var/lib/apt/lists/*
1818

1919
ENV GPG_KEY %%PLACEHOLDER%%

Dockerfile-slim.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ RUN set -ex \
2020
\
2121
&& savedAptMark="$(apt-mark showmanual)" \
2222
&& apt-get update && apt-get install -y --no-install-recommends \
23+
bluez-dev \
2324
dpkg-dev \
2425
gcc \
2526
libbz2-dev \
@@ -38,7 +39,6 @@ RUN set -ex \
3839
wget \
3940
xz-utils \
4041
zlib1g-dev \
41-
libbluetooth-dev \
4242
# as of Stretch, "gpg" is no longer included by default
4343
$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
4444
\

0 commit comments

Comments
 (0)