Merge pull request #256 from joshuawarner32/docker

Add i386 and openjdk dockerfiles
This commit is contained in:
Joel Dice 2014-05-10 18:55:11 -06:00
commit 84d97fb34c
3 changed files with 43 additions and 7 deletions

12
docker/i386/Dockerfile Normal file
View File

@ -0,0 +1,12 @@
FROM joshuawarner32/avian-build
MAINTAINER Joshua Warner, joshuawarner32@gmail.com
RUN dpkg --add-architecture i386 && \
apt-get update && \
apt-get install -y \
libc6-dev-i386 && \
apt-get download \
zlib1g-dev:i386 && \
dpkg -x *.deb / && \
rm *.deb && \
apt-get clean all

17
docker/openjdk/Dockerfile Normal file
View File

@ -0,0 +1,17 @@
FROM joshuawarner32/avian-build-i386
MAINTAINER Joshua Warner, joshuawarner32@gmail.com
RUN echo 'deb-src http://http.debian.net/debian jessie main' >> /etc/apt/sources.list && \
apt-get update && \
apt-get install -y \
libcups2-dev \
libgconf2-dev && \
mkdir /var/openjdk/ && \
cd /var/openjdk/ && \
apt-get source openjdk-7 && \
apt-get clean all && \
rm /var/openjdk/*.gz /var/openjdk/*.dsc && \
cd /var/openjdk/ && \
tar -xzf /var/openjdk/openjdk*/jdk.tar.gz && \
mv /var/openjdk/jdk-*/src /var/openjdk-src && \
rm -rf /var/openjdk

View File

@ -2,21 +2,28 @@
set -e
run() {
echo '==============================================='
echo "${@}"
echo '==============================================='
"${@}"
}
if [ -z "${test_target}" ]; then
test_target=test
fi
# we shouldn't run jdk-test builds if we're not running the test target
if [ ${test_target} = test ]; then
make ${flags} jdk-test
run make ${flags} jdk-test
fi
make ${flags} ${test_target}
make ${flags} mode=debug ${test_target}
make ${flags} process=interpret ${test_target}
run make ${flags} ${test_target}
run make ${flags} mode=debug ${test_target}
run make ${flags} process=interpret ${test_target}
# bootimage and openjdk builds without openjdk-src don't work:
if [ -z "${openjdk}" ]; then
make ${flags} bootimage=true ${test_target}
run make ${flags} bootimage=true ${test_target}
fi
make ${flags} tails=true continuations=true ${test_target}
make ${flags} codegen-targets=all
run make ${flags} tails=true continuations=true ${test_target}
run make ${flags} codegen-targets=all