diff --git a/app-backend/built/user/ImageMaker.js.map b/app-backend/built/user/ImageMaker.js.map index 12d13fb..f11d4f4 100644 --- a/app-backend/built/user/ImageMaker.js.map +++ b/app-backend/built/user/ImageMaker.js.map @@ -1 +1 @@ -{"version":3,"file":"ImageMaker.js","sourceRoot":"","sources":["../../src/user/ImageMaker.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ImageMaker.js","sourceRoot":"","sources":["../../src/user/ImageMaker.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/app-backend/built/user/ServiceManager.js b/app-backend/built/user/ServiceManager.js index 164d115..f65b8ad 100644 --- a/app-backend/built/user/ServiceManager.js +++ b/app-backend/built/user/ServiceManager.js @@ -381,7 +381,8 @@ class ServiceManager { getBuildStatus(appName) { const self = this; this.buildLogs[appName] = - this.buildLogs[appName] || new BuildLog(CaptainConstants.buildLogSize); + this.buildLogs[appName] || + new BuildLog(CaptainConstants.buildLogSize); return { isAppBuilding: self.isAppBuilding(appName), logs: self.buildLogs[appName].getLogs(), @@ -391,7 +392,8 @@ class ServiceManager { logBuildFailed(appName, error) { error = (error || '') + ''; this.buildLogs[appName] = - this.buildLogs[appName] || new BuildLog(CaptainConstants.buildLogSize); + this.buildLogs[appName] || + new BuildLog(CaptainConstants.buildLogSize); this.buildLogs[appName].onBuildFailed(error); } ensureServiceInitedAndUpdated(appName) { @@ -430,6 +432,10 @@ class ServiceManager { if (!imageName) { throw new Error('ImageName for deployed version is not available, this is impossible!'); } + Logger.d(`Creating service ${serviceName} with default image, we will update image later`); + // if we pass in networks here. Almost always it results in a delayed update which causes + // update errors if they happen right away! + return dockerApi.createServiceOnNodeId(CaptainConstants.appPlaceholderImageName, serviceName, undefined, undefined, undefined, undefined, undefined); } }) .then(function () { @@ -437,10 +443,6 @@ class ServiceManager { }) .then(function (data) { dockerAuthObject = data; - Logger.d(`Creating service ${serviceName} with image ${imageName}`); - // if we pass in networks here. Almost always it results in a delayed update which causes - // update errors if they happen right away! - return dockerApi.createServiceOnNodeId(CaptainConstants.appPlaceholderImageName, serviceName, undefined, undefined, undefined, undefined, undefined); }) .then(function () { return self.createPreDeployFunctionIfExist(app); diff --git a/app-backend/built/user/ServiceManager.js.map b/app-backend/built/user/ServiceManager.js.map index 1357ac9..f749189 100644 --- a/app-backend/built/user/ServiceManager.js.map +++ b/app-backend/built/user/ServiceManager.js.map @@ -1 +1 @@ -{"version":3,"file":"ServiceManager.js","sourceRoot":"","sources":["../../src/user/ServiceManager.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ServiceManager.js","sourceRoot":"","sources":["../../src/user/ServiceManager.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/app-backend/src/user/ImageMaker.ts b/app-backend/src/user/ImageMaker.ts index 03fe345..03df461 100644 --- a/app-backend/src/user/ImageMaker.ts +++ b/app-backend/src/user/ImageMaker.ts @@ -42,12 +42,10 @@ import tar = require('tar') import path = require('path') import TemplateHelper = require('./TemplateHelper') import GitHelper = require('../utils/GitHelper') -import uuid = require('uuid/v4') import ApiStatusCodes = require('../api/ApiStatusCodes') import { AnyError } from '../models/OtherTypes' import BuildLog = require('./BuildLog') import DataStore = require('../datastore/DataStore') -import ServiceManager = require('./ServiceManager'); const RAW_SOURCE_DIRECTORY = 'source_files' const TAR_FILE_NAME_READY_FOR_DOCKER = 'image.tar' diff --git a/app-backend/src/user/ServiceManager.ts b/app-backend/src/user/ServiceManager.ts index 3a476c4..bf5af3e 100644 --- a/app-backend/src/user/ServiceManager.ts +++ b/app-backend/src/user/ServiceManager.ts @@ -11,7 +11,6 @@ import BuildLog = require('./BuildLog') import { ImageInfo } from 'dockerode' import ImageMaker = require('./ImageMaker') - class ServiceManager { private activeBuilds: IHashMapGeneric private buildLogs: IHashMapGeneric @@ -533,7 +532,8 @@ class ServiceManager { getBuildStatus(appName: string) { const self = this this.buildLogs[appName] = - this.buildLogs[appName] || new BuildLog(CaptainConstants.buildLogSize) + this.buildLogs[appName] || + new BuildLog(CaptainConstants.buildLogSize) return { isAppBuilding: self.isAppBuilding(appName), @@ -545,7 +545,8 @@ class ServiceManager { logBuildFailed(appName: string, error: string) { error = (error || '') + '' this.buildLogs[appName] = - this.buildLogs[appName] || new BuildLog(CaptainConstants.buildLogSize) + this.buildLogs[appName] || + new BuildLog(CaptainConstants.buildLogSize) this.buildLogs[appName].onBuildFailed(error) } @@ -591,6 +592,22 @@ class ServiceManager { 'ImageName for deployed version is not available, this is impossible!' ) } + + Logger.d( + `Creating service ${serviceName} with default image, we will update image later` + ) + + // if we pass in networks here. Almost always it results in a delayed update which causes + // update errors if they happen right away! + return dockerApi.createServiceOnNodeId( + CaptainConstants.appPlaceholderImageName, + serviceName, + undefined, + undefined, + undefined, + undefined, + undefined + ) } }) .then(function() { @@ -600,22 +617,6 @@ class ServiceManager { }) .then(function(data) { dockerAuthObject = data - - Logger.d( - `Creating service ${serviceName} with image ${imageName}` - ) - - // if we pass in networks here. Almost always it results in a delayed update which causes - // update errors if they happen right away! - return dockerApi.createServiceOnNodeId( - CaptainConstants.appPlaceholderImageName, - serviceName, - undefined, - undefined, - undefined, - undefined, - undefined - ) }) .then(function() { return self.createPreDeployFunctionIfExist(app)