ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-27 08:22:35 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Update docker container and JDK make file

Browse Source 
* Add missing build dependencies to `docker-minimal`
 * Build JDK without ALSA, CUPS, FreeType, Pulse and X11
This commit is contained in:
Tommy Lillehagen 2017-10-16 15:46:29 +01:00
parent 571c1ff31f
commit fdf29f3c58
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sgx-jvm/Makefile
View File

@ -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

2
sgx-jvm/dependencies/README.md
View File

@ -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
```
```

6
sgx-jvm/dependencies/docker-minimal/Dockerfile
View File

@ -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