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/06/23 14:07:33 UTC
[1/2] incubator-joshua git commit: Migrated the Dockerfile to use new
Maven build
Repository: incubator-joshua
Updated Branches:
refs/heads/master f3a511836 -> 6aef63d78
Migrated the Dockerfile to use new Maven build
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/f7812790
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/f7812790
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/f7812790
Branch: refs/heads/master
Commit: f78127902d11c3aa0590159aa48d63970f02b95c
Parents: a06a015
Author: David Meikle <da...@logicalspark.com>
Authored: Wed Jun 22 18:54:59 2016 +0100
Committer: David Meikle <da...@logicalspark.com>
Committed: Wed Jun 22 18:54:59 2016 +0100
----------------------------------------------------------------------
distribution/docker/Dockerfile | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/f7812790/distribution/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/distribution/docker/Dockerfile b/distribution/docker/Dockerfile
index fe875a4..4c014fe 100644
--- a/distribution/docker/Dockerfile
+++ b/distribution/docker/Dockerfile
@@ -15,14 +15,20 @@
FROM java:latest
+LABEL Description="This image is used to provide a Joshua Decoder environment" Vendor="Apache Software Foundation"
+
RUN apt-get update && \
apt-get install -y \
- ant \
cmake \
+ git \
g++ \
libboost-all-dev \
+ libbz2-dev \
+ libeigen3-dev \
+ liblzma-dev \
libz-dev \
- make
+ make \
+ maven
RUN mkdir /opt/joshua
@@ -36,4 +42,6 @@ ENV JOSHUA=/opt/joshua
# copy Joshua source code to image
COPY . $JOSHUA
-RUN ant
+RUN sh download-deps.sh
+
+RUN mvn clean compile assembly:single
[2/2] incubator-joshua git commit: Merge branch 'master' of
https://github.com/LogicalSpark/incubator-joshua
Posted by mj...@apache.org.
Merge branch 'master' of https://github.com/LogicalSpark/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/6aef63d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/6aef63d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/6aef63d7
Branch: refs/heads/master
Commit: 6aef63d7893f776f2d23e0f797ed7dc1123c756a
Parents: f3a5118 f781279
Author: Matt Post <po...@cs.jhu.edu>
Authored: Thu Jun 23 10:07:22 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Thu Jun 23 10:07:22 2016 -0400
----------------------------------------------------------------------
distribution/docker/Dockerfile | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------