Skip to contentSkip to conversation

Dockerfile: Update to the bionic-20191029 tag

PATCH New Tom Rini 1 participant 2 messages Dec 6, 2019

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/2 Dockerfile: Update to the bionic-20191029 tag

Move up to the latest tag to get the usual related security fixes that brings in.

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Dockerfile +1 -1
index 43e739601741..9803ff47f814 100644
@@ -2,7 +2,7 @@
 # This Dockerfile is used to build an image containing basic stuff to be used
 # to build U-Boot and run our test suites.
 
-FROM ubuntu:bionic-20191010
+FROM ubuntu:bionic-20191029
 MAINTAINER Tom Rini <[email protected]>
 LABEL Description=" This image is for building U-Boot inside a container"
 
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/2 Dockerfile: Add required utilities for EFI Secure Boot tests

Based on the series to add support for the EFI Secure Boot tests to Travis, update the Docker container to have the same utilities.

Cc AKASHI Takahiro <[email protected]>
---
 Dockerfile | 10 ++++++++++
 1 file changed, 10 insertions(+)
Dockerfile +10 -0
index 9803ff47f814..1aa7e04da0e7 100644
@@ -39,6 +39,7 @@ RUN apt-get update && apt-get install -y \
 	bison \
 	build-essential \
 	clang-7 \
+	coreutils \
 	cpio \
 	cppcheck \
 	curl \
@@ -62,7 +63,11 @@ RUN apt-get update && apt-get install -y \
 	libusb-1.0-0-dev \
 	lzma-alone \
 	lzop \
+	mount \
+	mtools \
+	openssl \
 	picocom \
+	parted \
 	python \
 	python-dev \
 	python-pip \
@@ -70,11 +75,13 @@ RUN apt-get update && apt-get install -y \
 	python3-pip \
 	python3-sphinx \
 	rpm2cpio \
+	sbsigntool \
 	sloccount \
 	sparse \
 	srecord \
 	sudo \
 	swig \
+	util-linux \
 	virtualenv \
 	zip \
 	&& rm -rf /var/lib/apt/lists/*
@@ -82,6 +89,9 @@ RUN apt-get update && apt-get install -y \
 # Manually install libmpfr4 for the toolchains
 RUN wget http://mirrors.kernel.org/ubuntu/pool/main/m/mpfr4/libmpfr4_3.1.4-1_amd64.deb && dpkg -i libmpfr4_3.1.4-1_amd64.deb && rm libmpfr4_3.1.4-1_amd64.deb
 
+# Manually install a new enough version of efitools (must be v1.5.2 or later)
+RUN wget http://mirrors.kernel.org/ubuntu/pool/universe/e/efitools/efitools_1.8.1-0ubuntu2_amd64.deb && sudo dpkg -i efitools_1.8.1-0ubuntu2_amd64.deb && rm efitools_1.8.1-0ubuntu2_amd64.deb
+
 # Build GRUB UEFI targets grubarm.efi and grubaa64.efi
 RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \
 	cd /tmp/grub && \
Signature · 1 line
2.17.1