From fdf29f3c5804e52733c9728ea8128fbb41d6ba1b Mon Sep 17 00:00:00 2001 From: Tommy Lillehagen Date: Mon, 16 Oct 2017 15:46:29 +0100 Subject: [PATCH] Update docker container and JDK make file * Add missing build dependencies to `docker-minimal` * Build JDK without ALSA, CUPS, FreeType, Pulse and X11 --- sgx-jvm/Makefile | 5 ++++- sgx-jvm/dependencies/README.md | 2 +- sgx-jvm/dependencies/docker-minimal/Dockerfile | 6 ++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sgx-jvm/Makefile b/sgx-jvm/Makefile index a11c60182f..436a11994e 100644 --- a/sgx-jvm/Makefile +++ b/sgx-jvm/Makefile @@ -29,7 +29,10 @@ jdk8u: git clone -b deterministic-jvm8 --single-branch https://github.com/corda/openjdk $@ $(JDK_IMAGE): jdk8u - cd jdk8u && $(SHELL) ./configure && $(MAKE) JOBS=2 images docs + cd jdk8u && \ + ALSA_NOT_NEEDED=yes CUPS_NOT_NEEDED=yes FREETYPE_NOT_NEEDED=yes \ + PULSE_NOT_NEEDED=yes X11_NOT_NEEDED=yes $(SHELL) ./configure && \ + $(MAKE) JOBS=2 images docs linux-sgx/external/ippcp_internal/inc: cd linux-sgx && $(SHELL) ./download_prebuilt.sh diff --git a/sgx-jvm/dependencies/README.md b/sgx-jvm/dependencies/README.md index 1c42406d6a..e16398cab2 100644 --- a/sgx-jvm/dependencies/README.md +++ b/sgx-jvm/dependencies/README.md @@ -26,4 +26,4 @@ Some dependencies are still required to be installed, these are specified in `do ```bash $ docker build -t minimal docker-minimal # builds a Docker image using docker-minimal/ $ bash build_in_image.sh minimal # Runs the build inside the `minimal` image -``` \ No newline at end of file +``` diff --git a/sgx-jvm/dependencies/docker-minimal/Dockerfile b/sgx-jvm/dependencies/docker-minimal/Dockerfile index 27de27d65d..4de99cea0b 100644 --- a/sgx-jvm/dependencies/docker-minimal/Dockerfile +++ b/sgx-jvm/dependencies/docker-minimal/Dockerfile @@ -1,6 +1,8 @@ FROM ubuntu:xenial RUN apt-get update -y -RUN apt-get install -y make gcc autoconf cmake g++ openjdk-8-jdk libtool ocaml python2.7 -RUN apt-get install -y mercurial wget +RUN apt-get install -y \ + autoconf ccache cmake cpio g++ gcc git libtool make \ + ocaml openjdk-8-jdk python2.7 unzip wget zip + ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64