You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myriad.apache.org by da...@apache.org on 2016/03/10 06:04:01 UTC
incubator-myriad git commit: MYRIAD-186 Clean up the build [Forced
Update!]
Repository: incubator-myriad
Updated Branches:
refs/heads/master 4246a2a56 -> b56565046 (forced update)
MYRIAD-186 Clean up the build
JIRA:
[MYRIAD-186] https://issues.apache.org/jira/browse/MYRIAD-186
Pull Request:
Closes #60
Project: http://git-wip-us.apache.org/repos/asf/incubator-myriad/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-myriad/commit/b5656504
Tree: http://git-wip-us.apache.org/repos/asf/incubator-myriad/tree/b5656504
Diff: http://git-wip-us.apache.org/repos/asf/incubator-myriad/diff/b5656504
Branch: refs/heads/master
Commit: b56565046c60382d99c40bd31d1e7fc8e6fdd635
Parents: 9c03f6a
Author: Zachary Jaffee <zj...@salesforce.com>
Authored: Fri Feb 26 15:31:08 2016 -0800
Committer: darinj <da...@gmail.com>
Committed: Wed Mar 9 23:56:35 2016 -0500
----------------------------------------------------------------------
docker/Dockerfile | 1 -
docker/ResourceManager.dockerfile | 1 -
docker/build-myriad.sh | 1 -
myriad-executor/build.gradle | 23 -----------------------
4 files changed, 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/b5656504/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 47cc2d2..18d4084 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -43,7 +43,6 @@ ADD myriad-bin/install-yarn.sh /install-yarn.sh
RUN sh /install-yarn.sh
# Copy over myriad libraries
-ADD /libs/myriad-executor-runnable-0.1.0.jar /usr/local/libexec/mesos/
ADD /libs/* /usr/local/hadoop/share/hadoop/yarn/lib/
http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/b5656504/docker/ResourceManager.dockerfile
----------------------------------------------------------------------
diff --git a/docker/ResourceManager.dockerfile b/docker/ResourceManager.dockerfile
index 7c3dbef..c4448d7 100644
--- a/docker/ResourceManager.dockerfile
+++ b/docker/ResourceManager.dockerfile
@@ -44,7 +44,6 @@ ADD myriad-bin/install-yarn.sh /install-yarn.sh
RUN sh /install-yarn.sh
# Copy over myriad libraries
-ADD /libs/myriad-executor-runnable-0.1.0.jar /usr/local/libexec/mesos/
ADD /libs/* /usr/local/hadoop/share/hadoop/yarn/lib/
# Initialize hadoop confs with env vars
http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/b5656504/docker/build-myriad.sh
----------------------------------------------------------------------
diff --git a/docker/build-myriad.sh b/docker/build-myriad.sh
index 38d6b95..d3b0e74 100644
--- a/docker/build-myriad.sh
+++ b/docker/build-myriad.sh
@@ -37,6 +37,5 @@ fi
# Copy over the Java Libraries
cp -rf ../myriad-scheduler/build/libs/* libs/
-cp -rf ../myriad-executor/build/libs/myriad-executor-runnable-0.1.0.jar libs/
echo "Init complete! " #Modify config/myriad-default-config.yml to your liking before building the docker image"
http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/b5656504/myriad-executor/build.gradle
----------------------------------------------------------------------
diff --git a/myriad-executor/build.gradle b/myriad-executor/build.gradle
index 15529c9..05594d7 100644
--- a/myriad-executor/build.gradle
+++ b/myriad-executor/build.gradle
@@ -24,26 +24,3 @@ dependencies {
compile "org.apache.hadoop:hadoop-common:${hadoopVer}"
}
-
-task capsule(type: Jar, dependsOn: jar) {
- archiveName = "myriad-executor-runnable-${version}.jar"
-
- from jar
- from { configurations.runtime }
- from { configurations.myriadExecutorConf }
- from { sourceSets.main.resources }
-
- from(configurations.capsule.collect { zipTree(it) }) { include 'Capsule.class' }
-
- manifest {
- attributes(
- 'Main-Class': 'Capsule',
- 'Application-Class': 'org.apache.myriad.executor.MyriadExecutor',
- 'Min-Java-Version': '1.7.0',
- 'JVM-Args': run.jvmArgs.join(' '),
- 'System-Properties': (run.systemProperties).collect { k, v -> "$k=$v" }.join(' ')
- )
- }
-}
-
-build.dependsOn capsule