Skip to content

Commit 791838c

Browse files
committed
Merge pull request flynn#969 from flynn/dashboard-deploy-refactor
dashboard: Don't create release artifact when deploying
2 parents ab34780 + 0e14d12 commit 791838c

File tree

1 file changed

+3
-22
lines changed
  • dashboard/app/lib/javascripts/dashboard/stores

1 file changed

+3
-22
lines changed

dashboard/app/lib/javascripts/dashboard/stores/app.js

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -289,14 +289,7 @@ var App = Dashboard.Stores.App = Dashboard.Store.createClass({
289289
sha: sha
290290
});
291291

292-
return client.createArtifact({
293-
type: "docker",
294-
uri: "example://uri"
295-
}).then(function (args) {
296-
var res = args[0];
297-
artifactId = res.id;
298-
return createRelease();
299-
}).then(function () {
292+
return createRelease().then(function () {
300293
var data = {
301294
name: app.name,
302295
meta: meta
@@ -403,7 +396,7 @@ App.createFromGithub = function (client, meta, appData) {
403396
meta: meta
404397
};
405398

406-
var appId, appName, databaseEnv, artifactId;
399+
var appId, appName, databaseEnv;
407400

408401
function createDatabase () {
409402
return client.createAppDatabase({ apps: [appId] }).then(function (args) {
@@ -415,25 +408,13 @@ App.createFromGithub = function (client, meta, appData) {
415408
appName: appName,
416409
env: Marbles.Utils.extend({}, appData.env, databaseEnv)
417410
});
418-
return createArtifact();
419-
});
420-
}
421-
422-
function createArtifact () {
423-
return client.createArtifact({
424-
type: "docker",
425-
uri: "example://uri"
426-
}).then(function (args) {
427-
var res = args[0];
428-
artifactId = res.id;
429411
return createRelease();
430412
});
431413
}
432414

433415
function createRelease () {
434416
return client.createRelease({
435-
env: Marbles.Utils.extend({}, appData.env, databaseEnv),
436-
artifact: artifactId
417+
env: Marbles.Utils.extend({}, appData.env, databaseEnv)
437418
}).then(function (args) {
438419
var res = args[0];
439420
return createAppRelease(res.id);

0 commit comments

Comments
 (0)