Skip to content

Commit

Permalink
Merge pull request dcos#268 from BenWhitehead/cosmos-snapshot
Browse files Browse the repository at this point in the history
Update cosmos to 0.2.0-SNAPSHOT-69-refs_heads_master-dcf390ff14
  • Loading branch information
spahl committed Jul 6, 2016
2 parents bf8c0a1 + b01bc67 commit c594d6f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 15 deletions.
4 changes: 1 addition & 3 deletions packages/cosmos/build
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
mkdir -p "$PKG_PATH/lib/"
mkdir -p "$PKG_PATH/usr/"

cp -rp /pkg/extra/default-repositories.json "${PKG_PATH}/lib/default-repositories.json"
cp -rp /pkg/src/cosmos/cosmos-*-one-jar.jar "${PKG_PATH}/usr/cosmos.jar"
sudo chmod -R o+r "${PKG_PATH}/lib"
sudo chmod -R o+r "${PKG_PATH}/usr"

cosmos_service="${PKG_PATH}/dcos.target.wants_master/dcos-cosmos.service"
Expand All @@ -27,5 +25,5 @@ EnvironmentFile=/opt/mesosphere/environment
EnvironmentFile=-/var/lib/dcos/environment.proxy
ExecStartPre=/bin/ping -c1 ready.spartan
ExecStartPre=/opt/mesosphere/bin/bootstrap dcos-cosmos
ExecStart=/opt/mesosphere/bin/java -Xmx2G -classpath ${PKG_PATH}/lib/:${PKG_PATH}/usr/cosmos.jar com.simontuffs.onejar.Boot -com.mesosphere.cosmos.dataDir=/var/lib/dcos/cosmos
ExecStart=/opt/mesosphere/bin/java -Xmx2G -classpath ${PKG_PATH}/usr/cosmos.jar com.simontuffs.onejar.Boot -com.mesosphere.cosmos.dataDir=/var/lib/dcos/cosmos
EOF
4 changes: 2 additions & 2 deletions packages/cosmos/buildinfo.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
],
"single_source": {
"kind": "url",
"url": "https://downloads.dcos.io/cosmos/0.1.5-3/cosmos-server-0.1.5-3-one-jar.jar",
"sha1": "8345b8dd2a7ea143c73fc2288ced4d0226d52854"
"url": "https://downloads.dcos.io/cosmos/0.2.0-SNAPSHOT-69-refs_heads_master-dcf390ff14/cosmos-server-0.2.0-SNAPSHOT-69-refs_heads_master-dcf390ff14-one-jar.jar",
"sha1": "57333825ccd7053f4c438712e9e198125a16951c"
},
"username": "dcos_cosmos",
"state_directory": true
Expand Down
10 changes: 0 additions & 10 deletions packages/cosmos/extra/default-repositories.json

This file was deleted.

0 comments on commit c594d6f

Please sign in to comment.