Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update buildenv/docker/jdk9/* Dockerfile(s) #1541

Merged
merged 2 commits into from
Apr 8, 2018
Merged

Update buildenv/docker/jdk9/* Dockerfile(s) #1541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4589894
Update download links to libcups2-dev and libcupsimage2-dev libraries
babsingh Mar 26, 2018
2ff0027
Use AdoptOpenJDK OpenJ9 build as the boot jdk
babsingh Mar 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions buildenv/docker/jdk9/aarch64_CC/arm-linux-aarch64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ RUN apt-get update \
libxt-dev \
libxtst-dev \
make \
openjdk-8-jdk \
pkg-config \
qemu \
realpath \
Expand All @@ -68,6 +67,13 @@ RUN cd /root \
&& tar -xzf freemarker.tgz freemarker-2.3.8/lib/freemarker.jar --strip=2 \
&& rm -f freemarker.tgz

# Download and install boot JDK from AdoptOpenJDK
RUN cd /root \
&& wget -O bootjdk8.tar.gz https://api.adoptopenjdk.net/openjdk8-openj9/releases/x64_linux/latest/binary \
&& tar -xzf bootjdk8.tar.gz \
&& rm -f bootjdk8.tar.gz \
&& ls | grep -i jdk | xargs -I % sh -c 'mv % bootjdk8'

# get the toolchain
RUN cd /root \
&& wget https://releases.linaro.org/components/toolchain/binaries/4.9-2017.01/aarch64-linux-gnu/gcc-linaro-4.9.4-2017.01-x86_64_aarch64-linux-gnu.tar.xz \
Expand All @@ -83,8 +89,8 @@ RUN cd /root \
ADD \
http://ftp.us.debian.org/debian/pool/main/a/alsa-lib/libasound2_1.1.3-5_arm64.deb \
http://ftp.us.debian.org/debian/pool/main/a/alsa-lib/libasound2-dev_1.1.3-5_arm64.deb \
http://ftp.us.debian.org/debian/pool/main/c/cups/libcups2-dev_2.2.1-8_arm64.deb \
http://ftp.us.debian.org/debian/pool/main/c/cups/libcupsimage2-dev_2.2.1-8_arm64.deb \
http://ftp.us.debian.org/debian/pool/main/c/cups/libcups2-dev_2.2.1-8%2bdeb9u1_arm64.deb \
http://ftp.us.debian.org/debian/pool/main/c/cups/libcupsimage2-dev_2.2.1-8%2bdeb9u1_arm64.deb \
http://ftp.us.debian.org/debian/pool/main/d/dwarfutils/libdwarf-dev_20161124-1+deb9u1_arm64.deb \
http://ftp.us.debian.org/debian/pool/main/f/freetype/libfreetype6_2.6.3-3.2_arm64.deb \
http://ftp.us.debian.org/debian/pool/main/f/freetype/libfreetype6-dev_2.6.3-3.2_arm64.deb \
Expand Down Expand Up @@ -122,11 +128,15 @@ RUN cd /root/debs \
# Env vars set here will be visibile in the running container, so can be
# used to convey configuration information to the build scripts.

# Set environment variable JAVA_HOME, and prepend ${JAVA_HOME}/bin to PATH
ENV JAVA_HOME="/root/bootjdk8"
ENV PATH="${JAVA_HOME}/bin:${PATH}"

# Directory containing the cross compilation tool chain
ENV OPENJ9_CC_DIR /root/gcc-linaro-4.9.4-2017.01-x86_64_aarch64-linux-gnu
ENV OPENJ9_CC_DIR="/root/gcc-linaro-4.9.4-2017.01-x86_64_aarch64-linux-gnu"

# Prefix for the cross compilation tools (without the trailing '-')
ENV OPENJ9_CC_PREFIX aarch64-linux-gnu
ENV OPENJ9_CC_PREFIX="aarch64-linux-gnu"

# Add the toolchain bin dir to the PATH for convenience
ENV PATH="${PATH}:${OPENJ9_CC_DIR}/bin"
Expand Down
20 changes: 15 additions & 5 deletions buildenv/docker/jdk9/armhf_CC/arm-linux-gnueabihf/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ RUN apt-get update \
libxt-dev \
libxtst-dev \
make \
openjdk-8-jdk \
pkg-config \
qemu \
realpath \
Expand All @@ -68,6 +67,13 @@ RUN cd /root \
&& tar -xzf freemarker.tgz freemarker-2.3.8/lib/freemarker.jar --strip=2 \
&& rm -f freemarker.tgz

# Download and install boot JDK from AdoptOpenJDK
RUN cd /root \
&& wget -O bootjdk8.tar.gz https://api.adoptopenjdk.net/openjdk8-openj9/releases/x64_linux/latest/binary \
&& tar -xzf bootjdk8.tar.gz \
&& rm -f bootjdk8.tar.gz \
&& ls | grep -i jdk | xargs -I % sh -c 'mv % bootjdk8'

# get the toolchain
RUN cd /root \
&& wget https://releases.linaro.org/components/toolchain/binaries/4.9-2017.01/arm-linux-gnueabihf/gcc-linaro-4.9.4-2017.01-x86_64_arm-linux-gnueabihf.tar.xz \
Expand All @@ -83,8 +89,8 @@ RUN cd /root \
ADD \
http://ftp.us.debian.org/debian/pool/main/a/alsa-lib/libasound2_1.1.3-5_armhf.deb \
http://ftp.us.debian.org/debian/pool/main/a/alsa-lib/libasound2-dev_1.1.3-5_armhf.deb \
http://ftp.us.debian.org/debian/pool/main/c/cups/libcups2-dev_2.2.1-8_armhf.deb \
http://ftp.us.debian.org/debian/pool/main/c/cups/libcupsimage2-dev_2.2.1-8_armhf.deb \
http://ftp.us.debian.org/debian/pool/main/c/cups/libcups2-dev_2.2.1-8%2bdeb9u1_armhf.deb \
http://ftp.us.debian.org/debian/pool/main/c/cups/libcupsimage2-dev_2.2.1-8%2bdeb9u1_armhf.deb \
http://ftp.us.debian.org/debian/pool/main/d/dwarfutils/libdwarf-dev_20161124-1+deb9u1_armhf.deb \
http://ftp.us.debian.org/debian/pool/main/f/freetype/libfreetype6_2.6.3-3.2_armhf.deb \
http://ftp.us.debian.org/debian/pool/main/f/freetype/libfreetype6-dev_2.6.3-3.2_armhf.deb \
Expand Down Expand Up @@ -122,11 +128,15 @@ RUN cd /root/debs \
# Env vars set here will be visibile in the running container, so can be
# used to convey configuration information to the build scripts.

# Set environment variable JAVA_HOME, and prepend ${JAVA_HOME}/bin to PATH
ENV JAVA_HOME="/root/bootjdk8"
ENV PATH="${JAVA_HOME}/bin:${PATH}"

# Directory containing the cross compilation tool chain
ENV OPENJ9_CC_DIR /root/gcc-linaro-4.9.4-2017.01-x86_64_arm-linux-gnueabihf
ENV OPENJ9_CC_DIR="/root/gcc-linaro-4.9.4-2017.01-x86_64_arm-linux-gnueabihf"

# Prefix for the cross compilation tools (without the trailing '-')
ENV OPENJ9_CC_PREFIX arm-linux-gnueabihf
ENV OPENJ9_CC_PREFIX="arm-linux-gnueabihf"

# Add the toolchain bin dir to the PATH for convenience
ENV PATH="${PATH}:${OPENJ9_CC_DIR}/bin"
Expand Down
15 changes: 13 additions & 2 deletions buildenv/docker/jdk9/ppc64le/ubuntu16/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2017, 2017 IBM Corp. and others
# Copyright (c) 2017, 2018 IBM Corp. and others
#
# This program and the accompanying materials are made available under
# the terms of the Eclipse Public License 2.0 which accompanies this
Expand All @@ -22,7 +22,7 @@
# docker build -t=openj9 .
# docker run -it openj9

FROM ppc64le/ibmjava:8-sdk
FROM ubuntu:16.04

# Install required OS tools
RUN apt-get update \
Expand Down Expand Up @@ -74,4 +74,15 @@ RUN cd /root \
&& tar -xzf freemarker.tgz freemarker-2.3.8/lib/freemarker.jar --strip=2 \
&& rm -f freemarker.tgz

# Download and install boot JDK from AdoptOpenJDK
RUN cd /root \
&& wget -O bootjdk8.tar.gz https://api.adoptopenjdk.net/openjdk8-openj9/releases/ppc64le_linux/latest/binary \
&& tar -xzf bootjdk8.tar.gz \
&& rm -f bootjdk8.tar.gz \
&& ls | grep -i jdk | xargs -I % sh -c 'mv % bootjdk8'

# Set environment variable JAVA_HOME, and prepend ${JAVA_HOME}/bin to PATH
ENV JAVA_HOME="/root/bootjdk8"
ENV PATH="${JAVA_HOME}/bin:${PATH}"

WORKDIR /root
15 changes: 13 additions & 2 deletions buildenv/docker/jdk9/s390x/ubuntu16/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2017, 2017 IBM Corp. and others
# Copyright (c) 2017, 2018 IBM Corp. and others
#
# This program and the accompanying materials are made available under
# the terms of the Eclipse Public License 2.0 which accompanies this
Expand All @@ -22,7 +22,7 @@
# docker build -t=openj9 .
# docker run -it openj9

FROM s390x/ibmjava:8-sdk
FROM ubuntu:16.04

# Install required OS tools
RUN apt-get update \
Expand Down Expand Up @@ -73,4 +73,15 @@ RUN cd /root \
&& tar -xzf freemarker.tgz freemarker-2.3.8/lib/freemarker.jar --strip=2 \
&& rm -f freemarker.tgz

# Download and install boot JDK from AdoptOpenJDK
RUN cd /root \
&& wget -O bootjdk8.tar.gz https://api.adoptopenjdk.net/openjdk8-openj9/releases/s390x_linux/latest/binary \
&& tar -xzf bootjdk8.tar.gz \
&& rm -f bootjdk8.tar.gz \
&& ls | grep -i jdk | xargs -I % sh -c 'mv % bootjdk8'

# Set environment variable JAVA_HOME, and prepend ${JAVA_HOME}/bin to PATH
ENV JAVA_HOME="/root/bootjdk8"
ENV PATH="${JAVA_HOME}/bin:${PATH}"

WORKDIR /root
14 changes: 12 additions & 2 deletions buildenv/docker/jdk9/x86_64/ubuntu16/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2017, 2017 IBM Corp. and others
# Copyright (c) 2017, 2018 IBM Corp. and others
#
# This program and the accompanying materials are made available under
# the terms of the Eclipse Public License 2.0 which accompanies this
Expand Down Expand Up @@ -48,7 +48,6 @@ RUN apt-get update \
libxt-dev \
libxtst-dev \
make \
openjdk-8-jdk \
pkg-config \
realpath \
ssh \
Expand All @@ -75,4 +74,15 @@ RUN cd /root \
&& tar -xzf freemarker.tgz freemarker-2.3.8/lib/freemarker.jar --strip=2 \
&& rm -f freemarker.tgz

# Download and install boot JDK from AdoptOpenJDK
RUN cd /root \
&& wget -O bootjdk8.tar.gz https://api.adoptopenjdk.net/openjdk8-openj9/releases/x64_linux/latest/binary \
&& tar -xzf bootjdk8.tar.gz \
&& rm -f bootjdk8.tar.gz \
&& ls | grep -i jdk | xargs -I % sh -c 'mv % bootjdk8'

# Set environment variable JAVA_HOME, and prepend ${JAVA_HOME}/bin to PATH
ENV JAVA_HOME="/root/bootjdk8"
ENV PATH="${JAVA_HOME}/bin:${PATH}"

WORKDIR /root