summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <gaumless@gmail.com>2017-09-17 17:35:52 -0600
committerMartin Roth <martinroth@google.com>2017-09-20 01:29:55 +0000
commitbea2d75f3174a8fbd24be2010977f975e7a16720 (patch)
tree8d12a7b0404256e8e3627445a849ab5c8b608019
parent387dec815c840d25dab00a16214d1c90ee44f0a7 (diff)
downloadcoreboot-bea2d75f3174a8fbd24be2010977f975e7a16720.tar.xz
util/docker: Update coreboot-sdk dockerfile
- Fix typo in comment - Aphabetize package list and put each package on a single line - Add environment variables into coreboot user's .bashrc file - Add openssl, qemu, and shellcheck to installed packages Change-Id: I37771be5d3ecaa61d76d99e689b422144a6d7dc6 Signed-off-by: Martin Roth <gaumless@gmail.com> Reviewed-on: https://review.coreboot.org/21582 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Chris Ching <chingcodes@chromium.org>
-rw-r--r--util/docker/coreboot-sdk/Dockerfile66
1 files changed, 55 insertions, 11 deletions
diff --git a/util/docker/coreboot-sdk/Dockerfile b/util/docker/coreboot-sdk/Dockerfile
index 8345c18299..512db0659d 100644
--- a/util/docker/coreboot-sdk/Dockerfile
+++ b/util/docker/coreboot-sdk/Dockerfile
@@ -1,5 +1,5 @@
# This dockerfile is not meant to be used directly by docker. The
-# {{}} varibles are replaced with values by the makefile. Please generate
+# {{}} variables are replaced with values by the makefile. Please generate
# the docker image for this file by running:
#
# make coreboot-sdk
@@ -18,15 +18,55 @@ MAINTAINER Martin Roth <martin@coreboot.org>
RUN \
useradd -p locked -m coreboot && \
apt-get -qq update && \
- apt-get -qqy install gcc g++ gnat-6 make patch python diffutils bison \
- flex git doxygen ccache subversion p7zip-full unrar-free \
- m4 wget curl bzip2 vim-common cmake xz-utils pkg-config \
- dh-autoreconf unifont \
- libssl1.0-dev libgmp-dev zlib1g-dev libpci-dev liblzma-dev \
- libyaml-dev libncurses5-dev uuid-dev libusb-dev libftdi-dev \
- libusb-1.0-0-dev libreadline-dev libglib2.0-dev libgmp-dev \
- libelf-dev libxml2-dev libfreetype6-dev libisl-dev && \
- apt-get clean
+ apt-get -qqy install \
+ bison \
+ bzip2 \
+ ccache \
+ cmake \
+ curl \
+ dh-autoreconf \
+ diffutils \
+ doxygen \
+ flex \
+ g++ \
+ gawk \
+ gcc \
+ git \
+ gnat-6 \
+ libelf-dev \
+ libfreetype6-dev \
+ libftdi-dev \
+ libglib2.0-dev \
+ libgmp-dev \
+ libgmp-dev \
+ libisl-dev \
+ liblzma-dev \
+ libncurses5-dev \
+ libpci-dev \
+ libreadline-dev \
+ libssl1.0-dev \
+ libusb-1.0-0-dev \
+ libusb-dev \
+ libxml2-dev \
+ libyaml-dev \
+ m4 \
+ make \
+ openssl \
+ p7zip-full \
+ patch \
+ pkg-config \
+ python \
+ qemu \
+ shellcheck \
+ subversion \
+ unifont \
+ unrar-free \
+ uuid-dev \
+ vim-common \
+ wget \
+ xz-utils \
+ zlib1g-dev \
+ && apt-get clean
RUN \
cd /root && \
@@ -41,7 +81,11 @@ RUN \
RUN mkdir /home/coreboot/.ccache && \
chown coreboot:coreboot /home/coreboot/.ccache && \
mkdir /home/coreboot/cb_build && \
- chown coreboot:coreboot /home/coreboot/cb_build
+ chown coreboot:coreboot /home/coreboot/cb_build && \
+ echo "export PATH=$PATH:/opt/xgcc/bin" >> /home/coreboot/.bashrc && \
+ echo "export SDK_VERSION={{SDK_VERSION}}" >> /home/coreboot/.bashrc && \
+ echo "export SDK_COMMIT={{DOCKER_COMMIT}}" >> /home/coreboot/.bashrc
+
VOLUME /home/coreboot/.ccache
ENV PATH $PATH:/opt/xgcc/bin