Docker: remove duplicate installation of live-build

This commit is contained in:
Christian Poessinger 2019-03-31 16:43:03 +02:00
parent dda8ec6f3a
commit 6b5da3d866
2 changed files with 36 additions and 7 deletions

View File

@ -0,0 +1,36 @@
#!/bin/sh
# To get the possibility of reproducible builds we pin to a specific commit
# of the linux-firmware repository
COMMIT="7bc246451318b3536d9bfd3c4e46d541a9831b33"
echo I: Retrieving Linux Firmware (commit: ${COMMIT})
wget https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${COMMIT}.tar.gz -P /tmp
tar xf /tmp/linux-firmware-${COMMIT}.tar.gz -C /lib
mv /lib/linux-firmware-${COMMIT} /lib/firmware
# We do not need all firmware blobs .. cleanup
RM_FIRMWARE=" \
v4l-cx* \
s5p-mfc* \
nvidia \
amdgpu \
i915 \
radeon \
matrox \
mediatek \
qed \
sb16 \
ti-connectivity \
ueagle-atm \
dvb-* \
v4l-* \
i915 \
qcom \
ctfw-* \
ct2fw-* \
"
for dir in ${RM_FIRMWARE}; do
rm -rf /lib/firmware/${dir}
done

View File

@ -282,13 +282,6 @@ RUN echo 'deb http://ftp.debian.org/debian stretch main' | tee -a /etc/apt/sourc
apt-get update && \
rm -rf /var/lib/apt/lists/*
# Update live-build
RUN echo 'deb http://ftp.debian.org/debian stretch main' | tee -a /etc/apt/sources.list.d/stretch.list && \
apt-get update && apt-get install -y -t stretch live-build && \
rm -f /etc/apt/sources.list.d/stretch.list && \
apt-get update && \
rm -rf /var/lib/apt/lists/*
# Install packer
RUN export LATEST="$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | \
jq -r -M '.current_version')"; \