diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-03-31 16:43:03 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-03-31 16:43:03 +0200 |
| commit | 6b5da3d86615c52209b4c833f157a5ba065742d6 (patch) | |
| tree | 53bc584d4b0b5d9c142d58a19fe68105062b3d50 | |
| parent | dda8ec6f3a46b2dfe9f627c620b7fb57c25d70dc (diff) | |
| download | vyos-build-6b5da3d86615c52209b4c833f157a5ba065742d6.tar.gz vyos-build-6b5da3d86615c52209b4c833f157a5ba065742d6.zip | |
Docker: remove duplicate installation of live-build
| -rwxr-xr-x | data/live-build-config/hooks/live/40-linux-firmware.chroot | 36 | ||||
| -rw-r--r-- | docker/Dockerfile | 7 |
2 files changed, 36 insertions, 7 deletions
diff --git a/data/live-build-config/hooks/live/40-linux-firmware.chroot b/data/live-build-config/hooks/live/40-linux-firmware.chroot new file mode 100755 index 00000000..7cd51ffd --- /dev/null +++ b/data/live-build-config/hooks/live/40-linux-firmware.chroot @@ -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 diff --git a/docker/Dockerfile b/docker/Dockerfile index 46df8e4c..0dcab157 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -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')"; \ |