You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@joshua.apache.org by mj...@apache.org on 2016/11/22 18:55:45 UTC

[1/2] incubator-joshua git commit: Tweaked Dockerfile to contain only jre 1.8 and to use mvn package

Repository: incubator-joshua
Updated Branches:
  refs/heads/master 792cab9a2 -> fee638f83


Tweaked Dockerfile to contain only jre 1.8 and to use mvn package


Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/eb361ce8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/eb361ce8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/eb361ce8

Branch: refs/heads/master
Commit: eb361ce83fe2a6516880e8b0142df5c782fdf834
Parents: f446a2a
Author: Kellen Sunderland <ke...@gmail.com>
Authored: Mon Nov 21 22:55:13 2016 +0100
Committer: Kellen Sunderland <ke...@gmail.com>
Committed: Mon Nov 21 22:57:00 2016 +0100

----------------------------------------------------------------------
 distribution/docker/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/eb361ce8/distribution/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/distribution/docker/Dockerfile b/distribution/docker/Dockerfile
index 4c014fe..949865d 100644
--- a/distribution/docker/Dockerfile
+++ b/distribution/docker/Dockerfile
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM java:latest
+FROM maven:latest
 
 LABEL Description="This image is used to provide a Joshua Decoder environment" Vendor="Apache Software Foundation"
 
@@ -28,7 +28,7 @@ RUN apt-get update && \
             liblzma-dev \            
             libz-dev \
             make \
-            maven
+            ant
 
 
 RUN mkdir /opt/joshua
@@ -44,4 +44,4 @@ COPY . $JOSHUA
 
 RUN sh download-deps.sh
 
-RUN mvn clean compile assembly:single
+RUN mvn package


[2/2] incubator-joshua git commit: Merge branch 'master' of github.com:KellenSunderland/incubator-joshua

Posted by mj...@apache.org.
Merge branch 'master' of github.com:KellenSunderland/incubator-joshua


Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/fee638f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/fee638f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/fee638f8

Branch: refs/heads/master
Commit: fee638f831d8008b8ed4d5f47ea3dd1aafa028b1
Parents: 792cab9 eb361ce
Author: Matt Post <po...@cs.jhu.edu>
Authored: Tue Nov 22 13:55:37 2016 -0500
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Tue Nov 22 13:55:37 2016 -0500

----------------------------------------------------------------------
 distribution/docker/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------