Remove usbutils from machine builds (#91942)

pull/92122/head
Franck Nijhof 2023-04-27 17:10:07 +02:00 committed by GitHub
parent f9ac1f3839
commit 3aa82e122c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 7 additions and 46 deletions

View File

@ -2,5 +2,4 @@ ARG BUILD_VERSION
FROM homeassistant/amd64-homeassistant:$BUILD_VERSION FROM homeassistant/amd64-homeassistant:$BUILD_VERSION
RUN apk --no-cache add \ RUN apk --no-cache add \
libva-intel-driver \ libva-intel-driver
usbutils

View File

@ -5,5 +5,4 @@ FROM homeassistant/amd64-homeassistant:$BUILD_VERSION
# changes in generic-x86-64 as well. # changes in generic-x86-64 as well.
RUN apk --no-cache add \ RUN apk --no-cache add \
libva-intel-driver \ libva-intel-driver
usbutils

View File

@ -1,9 +1,7 @@
ARG BUILD_VERSION ARG BUILD_VERSION
FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
RUN apk --no-cache add \ RUN pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
usbutils \
&& pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
pybluez \ pybluez \
-c /usr/src/homeassistant/requirements_all.txt \ -c /usr/src/homeassistant/requirements_all.txt \
--use-deprecated=legacy-resolver --use-deprecated=legacy-resolver

View File

@ -1,5 +1,2 @@
ARG BUILD_VERSION ARG BUILD_VERSION
FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
RUN apk --no-cache add \
usbutils

View File

@ -1,5 +1,2 @@
ARG BUILD_VERSION ARG BUILD_VERSION
FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
RUN apk --no-cache add \
usbutils

View File

@ -1,5 +1,2 @@
ARG BUILD_VERSION ARG BUILD_VERSION
FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
RUN apk --no-cache add \
usbutils

View File

@ -1,5 +1,2 @@
ARG BUILD_VERSION ARG BUILD_VERSION
FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
RUN apk --no-cache add \
usbutils

View File

@ -1,5 +1,2 @@
ARG BUILD_VERSION ARG BUILD_VERSION
FROM homeassistant/armv7-homeassistant:$BUILD_VERSION FROM homeassistant/armv7-homeassistant:$BUILD_VERSION
RUN apk --no-cache add \
usbutils

View File

@ -1,5 +1,2 @@
ARG BUILD_VERSION ARG BUILD_VERSION
FROM homeassistant/armhf-homeassistant:$BUILD_VERSION FROM homeassistant/armhf-homeassistant:$BUILD_VERSION
RUN apk --no-cache add \
usbutils

View File

@ -1,5 +1,2 @@
ARG BUILD_VERSION ARG BUILD_VERSION
FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
RUN apk --no-cache add \
usbutils

View File

@ -1,5 +1,2 @@
ARG BUILD_VERSION ARG BUILD_VERSION
FROM homeassistant/i386-homeassistant:$BUILD_VERSION FROM homeassistant/i386-homeassistant:$BUILD_VERSION
RUN apk --no-cache add \
usbutils

View File

@ -1,5 +1,2 @@
ARG BUILD_VERSION ARG BUILD_VERSION
FROM homeassistant/amd64-homeassistant:$BUILD_VERSION FROM homeassistant/amd64-homeassistant:$BUILD_VERSION
RUN apk --no-cache add \
usbutils

View File

@ -3,8 +3,7 @@ FROM homeassistant/armhf-homeassistant:$BUILD_VERSION
RUN apk --no-cache add \ RUN apk --no-cache add \
raspberrypi \ raspberrypi \
raspberrypi-libs \ raspberrypi-libs
usbutils
## ##
# Set symlinks for raspberry pi camera binaries. # Set symlinks for raspberry pi camera binaries.

View File

@ -3,8 +3,7 @@ FROM homeassistant/armv7-homeassistant:$BUILD_VERSION
RUN apk --no-cache add \ RUN apk --no-cache add \
raspberrypi \ raspberrypi \
raspberrypi-libs \ raspberrypi-libs
usbutils
## ##
# Set symlinks for raspberry pi binaries. # Set symlinks for raspberry pi binaries.

View File

@ -4,7 +4,6 @@ FROM homeassistant/armv7-homeassistant:$BUILD_VERSION
RUN apk --no-cache add \ RUN apk --no-cache add \
raspberrypi \ raspberrypi \
raspberrypi-libs \ raspberrypi-libs \
usbutils \
&& pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \ && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
pybluez \ pybluez \
-c /usr/src/homeassistant/requirements_all.txt \ -c /usr/src/homeassistant/requirements_all.txt \

View File

@ -4,7 +4,6 @@ FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
RUN apk --no-cache add \ RUN apk --no-cache add \
raspberrypi \ raspberrypi \
raspberrypi-libs \ raspberrypi-libs \
usbutils \
&& pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \ && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
pybluez \ pybluez \
-c /usr/src/homeassistant/requirements_all.txt \ -c /usr/src/homeassistant/requirements_all.txt \

View File

@ -4,7 +4,6 @@ FROM homeassistant/armv7-homeassistant:$BUILD_VERSION
RUN apk --no-cache add \ RUN apk --no-cache add \
raspberrypi \ raspberrypi \
raspberrypi-libs \ raspberrypi-libs \
usbutils \
&& pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \ && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
pybluez \ pybluez \
-c /usr/src/homeassistant/requirements_all.txt \ -c /usr/src/homeassistant/requirements_all.txt \

View File

@ -4,7 +4,6 @@ FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
RUN apk --no-cache add \ RUN apk --no-cache add \
raspberrypi \ raspberrypi \
raspberrypi-libs \ raspberrypi-libs \
usbutils \
&& pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \ && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
pybluez \ pybluez \
-c /usr/src/homeassistant/requirements_all.txt \ -c /usr/src/homeassistant/requirements_all.txt \

View File

@ -1,8 +1,7 @@
ARG BUILD_VERSION ARG BUILD_VERSION
FROM homeassistant/armv7-homeassistant:$BUILD_VERSION FROM homeassistant/armv7-homeassistant:$BUILD_VERSION
RUN apk --no-cache add usbutils \ RUN pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
&& pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
pybluez \ pybluez \
-c /usr/src/homeassistant/requirements_all.txt \ -c /usr/src/homeassistant/requirements_all.txt \
--use-deprecated=legacy-resolver --use-deprecated=legacy-resolver

View File

@ -3,8 +3,7 @@ FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
RUN apk --no-cache add \ RUN apk --no-cache add \
raspberrypi \ raspberrypi \
raspberrypi-libs \ raspberrypi-libs
usbutils
## ##
# Set symlinks for raspberry pi binaries. # Set symlinks for raspberry pi binaries.