Move package installs up, add xz-utils

This commit is contained in:
Jesse Hills 2024-09-10 18:43:29 +12:00
parent a687682978
commit d2f7a621eb
No known key found for this signature in database
GPG key ID: BEAAE804EFD8E83A

View file

@ -53,6 +53,19 @@ CMD ["dashboard", "/config"]
FROM base-final AS base-hassio FROM base-final AS base-hassio
RUN \
set -x \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
nginx-light=1.22.1-9 \
jq \
xz-utils \
&& rm -rf \
/tmp/* \
/var/{cache,log}/* \
/var/lib/apt/lists/* \
/usr/src/*
ARG \ ARG \
BASHIO_VERSION=0.16.2 \ BASHIO_VERSION=0.16.2 \
TEMPIO_VERSION=2021.09.0 \ TEMPIO_VERSION=2021.09.0 \
@ -71,7 +84,7 @@ RUN \
elif [ "${TARGETARCH}${TARGETVARIANT}" = "amd64" ]; then \ elif [ "${TARGETARCH}${TARGETVARIANT}" = "amd64" ]; then \
export S6_ARCH="x86_64"; \ export S6_ARCH="x86_64"; \
export TEMPIO_ARCH="amd64"; \ export TEMPIO_ARCH="amd64"; \
elif [ "${TARGETARCH}${TARGETVARIANT}" = "arm64"]; then \ elif [ "${TARGETARCH}${TARGETVARIANT}" = "arm64" ]; then \
export S6_ARCH="aarch64"; \ export S6_ARCH="aarch64"; \
export TEMPIO_ARCH="aarch64"; \ export TEMPIO_ARCH="aarch64"; \
fi \ fi \
@ -99,18 +112,6 @@ RUN \
\ \
&& rm -rf /usr/src/* && rm -rf /usr/src/*
RUN \
set -x \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
nginx-light=1.22.1-9 \
jq \
&& rm -rf \
/tmp/* \
/var/{cache,log}/* \
/var/lib/apt/lists/* \
/usr/src/*
COPY docker/ha-addon-rootfs/ / COPY docker/ha-addon-rootfs/ /