modified Dockerfile and move to 2.4 gradle wrapper

STIXProject · Jun 22, 2015 · 9532979 · 9532979
1 parent 2a7fba0
commit 9532979
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 22 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,8 +6,8 @@ jdk:
 before_install:
   - chmod +x gradlew
 
-env: GRADLE_OPTS=-Dorg.gradle.daemon=true
+env: GRADLE_OPTS=-Dorg.gradle.daemon=true -Xmx1024m -Xms256m
 env: CI_OPTS=--stacktrace
 
 install: /bin/true
-script: "./gradlew -x signArchives"
+script: "./gradlew -x signArchives"
diff --git a/Dockerfile b/Dockerfile
@@ -16,22 +16,22 @@
 #
 # Then create a container using the image you just created via:
 #
-# docker run -t -i java_stix_img_v1_2_0_1 /bin/bash
+# docker run -t -i java_stix_img_v1_1_1_1 /bin/bash
 #
 # To retreive the jar archives from the running docker container use following 
 # from the command-line of your docker host, not the container:
 #
-# docker cp <container id>:/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT-javadoc.jar .
-# docker cp <container id>:/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT-sources.jar .
-# docker cp <container id>:/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT.jar .
+# docker cp <container id>:/java-stix/build/libs/stix-1.1.1.1-SNAPSHOT-javadoc.jar .
+# docker cp <container id>:/java-stix/build/libs/stix-1.1.1.1-SNAPSHOT-sources.jar .
+# docker cp <container id>:/java-stix/build/libs/stix-1.1.1.1-SNAPSHOT.jar .
 #
 # If the containder ID is not obvious, but you can also retrieve it via:
 #
 # docker ps
 #
 # An example of retrieving the snapshot jar would be the following:
 #
-# ➜  /tmp  docker cp 83ad9afb6096:/java-stix/build/libs/stix-1.2.0.1-SNAPSHOT.jar . 
+# ➜  /tmp  docker cp 83ad9afb6096:/java-stix/build/libs/stix-1.1.1.1-SNAPSHOT.jar . 
 #
 #
 ############################################################
@@ -43,7 +43,7 @@ FROM ubuntu:15.04
 MAINTAINER Michael Joseph Walsh
 
 # Update the sources list
-RUN apt-get update
+RUN apt-get -y update
 
 # Install cmd-line dev toolchain
 RUN apt-get install -y tar git curl nano wget dialog net-tools build-essential software-properties-common
@@ -65,14 +65,14 @@ RUN apt-get -y install openjdk-8-jdk
 #RUN apt-get install oracle-java7-installer
 #RUN apt-get install oracle-java8-installer
 
-# Clone the java-stix repo
-RUN git clone https://github.com/STIXProject/java-stix.git
+# Clone java-stix repo at the current branch into the container
+COPY . java-stix
 
 # Open the java-stix project
 WORKDIR java-stix
 
-# Checkout the v1.2.0.1 branch
-RUN git checkout -b v1.2.0.1 origin/v1.2.0.1
-
 # Build unsigned jar archives in debug to /java-stix/build/libs
-RUN ./gradlew -x signArchives -d 
+RUN ./gradlew -x signArchives -d
+
+# Clean up APT when done.
+RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
diff --git a/circle.yml b/circle.yml
@@ -2,9 +2,9 @@ machine:
   java:
     version: oraclejdk7
   environment:
-    GRADLE_OPTS: -Dorg.gradle.daemon=true
+    GRADLE_OPTS: -Dorg.gradle.daemon=true  -Xmx1024m -Xms256m
     CI_OPTS: --stacktrace --debug
 
 test:
   override:
-    - ./gradlew -x signArchives
+    - ./gradlew -x signArchives
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Apr 27 15:56:20 EDT 2015
+#Mon Jun 22 13:29:56 EDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip
diff --git a/gradlew b/gradlew
@@ -7,7 +7,7 @@
 ##############################################################################
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS="-Dorg.gradle.daemon=true -Xmx1024m -Xms256m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError"
+DEFAULT_JVM_OPTS=""
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
@@ -161,4 +161,4 @@ function splitJvmOpts() {
 eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
 JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain $CI_OPTS "$@" 
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
@@ -9,7 +9,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Dorg.gradle.daemon=true -Xmx1024m -Xms256m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError"
+set DEFAULT_JVM_OPTS=
 
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
@@ -72,7 +72,7 @@ set CMD_LINE_ARGS=%$
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CI_OPTS% %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell