Build SnakeYAML for different JDKs with docker without building images

9 files changed, 30 insertions, 72 deletions

diff --git a/docker-run-jdk6.sh b/docker-run-jdk6.sh
new file mode 100755
index 00000000..5904c908
--- /dev/null
+++ b/docker-run-jdk6.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+./docker-run.sh 6
+
diff --git a/docker-run-jdk7.sh b/docker-run-jdk7.sh
new file mode 100755
index 00000000..b2c97828
--- /dev/null
+++ b/docker-run-jdk7.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+./docker-run.sh 7
+
+
diff --git a/docker-run-jdk8.sh b/docker-run-jdk8.sh
new file mode 100755
index 00000000..aaf10f07
--- /dev/null
+++ b/docker-run-jdk8.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+./docker-run.sh 8
+
+
diff --git a/docker-run.sh b/docker-run.sh
new file mode 100755
index 00000000..3abaa887
--- /dev/null
+++ b/docker-run.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+if [ "$#" -ne 1 ]
+then
+  echo "Usage: docker-run.sh <JDK number> (number can be 6, 7, 8)"
+  exit 1
+fi
+
+docker run --rm -it               \
+    -u `id -u`:`id -g`            \
+    -v `pwd`:/work                \
+    -v ~:/my-home                 \
+    -e "HOME=/my-home"            \
+    -w /work                      \
+    maven:3-jdk-$1                \
+    mvn -Dmaven.repo.local=/my-home/.m2/repository clean test
+
diff --git a/docker/docker-info.txt b/docker/docker-info.txt
deleted file mode 100644
index 51b93e4e..00000000
--- a/docker/docker-info.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-How to run different JDKs
-
-cd <snakeyaml>/docker
-Java 8:
-docker build --tag=snakeyaml:java8 java8
-docker run -it snakeyaml:java8
-
-Java 7:
-docker build --tag=snakeyaml:java7 java7
-docker run -it snakeyaml:java7
-
-Java 6:
-docker build --tag=snakeyaml:java6 java6
-docker run -it snakeyaml:java6
diff --git a/docker/java6/Dockerfile b/docker/java6/Dockerfile
deleted file mode 100644
index a7e1e833..00000000
--- a/docker/java6/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-# SnakeYAML
-FROM java:6
-MAINTAINER Andrey Somov <public.somov@gmail.com>
-
-RUN apt-get update && apt-get install -y mercurial
-
-# Install Maven manually to avoid Java 7 installation
-WORKDIR /tmp
-RUN wget http://archive.apache.org/dist/maven/maven-3/3.0.5/binaries/apache-maven-3.0.5-bin.tar.gz
-RUN tar -xzvf apache-maven-3.0.5-bin.tar.gz -C /opt
-ENV M2_HOME /opt/apache-maven-3.0.5
-ENV PATH $PATH:$M2_HOME/bin
-RUN mkdir /projects
-WORKDIR /projects
-RUN hg clone https://bitbucket.org/asomov/snakeyaml
-WORKDIR /projects/snakeyaml
-
-CMD ["mvn", "test"]
-
-
diff --git a/docker/java7/Dockerfile b/docker/java7/Dockerfile
deleted file mode 100644
index a6d95945..00000000
--- a/docker/java7/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-# SnakeYAML
-FROM java:7
-MAINTAINER Andrey Somov <public.somov@gmail.com>
-
-RUN apt-get update && apt-get install -y mercurial
-
-# Install Maven manually to avoid Java 7 installation
-WORKDIR /tmp
-RUN wget http://apache.mirrors.hoobly.com/maven/maven-3/3.3.3/binaries/apache-maven-3.3.3-bin.tar.gz
-RUN tar -xzvf apache-maven-3.3.3-bin.tar.gz -C /opt
-ENV M2_HOME /opt/apache-maven-3.3.3
-ENV PATH $PATH:$M2_HOME/bin
-RUN mkdir /projects
-WORKDIR /projects
-RUN hg clone https://bitbucket.org/asomov/snakeyaml
-WORKDIR /projects/snakeyaml
-
-CMD ["mvn", "test"]
-
diff --git a/docker/java8/Dockerfile b/docker/java8/Dockerfile
deleted file mode 100644
index d6e050d6..00000000
--- a/docker/java8/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-# SnakeYAML
-FROM java:8
-MAINTAINER Andrey Somov <public.somov@gmail.com>
-
-RUN apt-get update && apt-get install -y mercurial
-
-# Install Maven manually to avoid Java 7 installation
-WORKDIR /tmp
-RUN wget http://apache.mirrors.hoobly.com/maven/maven-3/3.3.3/binaries/apache-maven-3.3.3-bin.tar.gz
-RUN tar -xzvf apache-maven-3.3.3-bin.tar.gz -C /opt
-ENV M2_HOME /opt/apache-maven-3.3.3
-ENV PATH $PATH:$M2_HOME/bin
-RUN mkdir /projects
-WORKDIR /projects
-RUN hg clone https://bitbucket.org/asomov/snakeyaml
-WORKDIR /projects/snakeyaml
-
-CMD ["mvn", "test", "-Pwith-java8-tests"]
-
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 3dfafb5f..5b4a527e 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -8,6 +8,9 @@
     <body>
         <release version="1.18-SNAPSHOT" date="in Mercurial" description="Maintenance">
             <action dev="asomov" type="update">
+                Build SnakeYAML for different JDKs with docker without building images (2016-02-22)
+            </action>
+            <action dev="asomov" type="update">
                 Update plugin versions (2016-02-19)
             </action>
         </release>