split constants to configs and constants

This commit is contained in:
Kasra Bigdeli
2018-12-05 21:04:38 -08:00
parent 4daa8dc01b
commit fdabffb14f
21 changed files with 64 additions and 57 deletions
+2 -2
View File
@@ -374,7 +374,7 @@ class DockerApi {
LogConfig: {
Type: 'json-file',
Config: {
'max-size': CaptainConstants.defaultMaxLogSize,
'max-size': CaptainConstants.configs.defaultMaxLogSize,
},
},
RestartPolicy: {
@@ -516,7 +516,7 @@ class DockerApi {
LogDriver: {
Name: 'json-file',
Options: {
'max-size': CaptainConstants.defaultMaxLogSize,
'max-size': CaptainConstants.configs.defaultMaxLogSize,
},
},
},
File diff suppressed because one or more lines are too long
+3 -3
View File
@@ -273,7 +273,7 @@ class CaptainManager {
}
getCaptainImageTags() {
const url = 'https://hub.docker.com/v2/repositories/' +
CaptainConstants.publishedNameOnDockerHub +
CaptainConstants.configs.publishedNameOnDockerHub +
'/tags';
return new Promise(function (resolve, reject) {
request(url, function (error, response, body) {
@@ -301,7 +301,7 @@ class CaptainManager {
updateCaptain(versionTag) {
const self = this;
return Promise.resolve().then(function () {
return self.dockerApi.updateService(CaptainConstants.captainServiceName, CaptainConstants.publishedNameOnDockerHub + ':' + versionTag, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
return self.dockerApi.updateService(CaptainConstants.captainServiceName, CaptainConstants.configs.publishedNameOnDockerHub + ':' + versionTag, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
});
}
getMyNodeId() {
@@ -651,7 +651,7 @@ class CaptainManager {
// Some DNS servers do not allow wild cards. Therefore this line may fail.
// We still allow users to specify the domains in their DNS settings individually
// SubDomains that need to be added are "captain." "registry." "app-name."
const url = (CaptainConstants.preCheckForWildCard
const url = (CaptainConstants.configs.preCheckForWildCard
? uuid()
: CaptainConstants.captainSubDomain) +
'.' +
File diff suppressed because one or more lines are too long
+2 -2
View File
@@ -43,7 +43,7 @@ class DockerRegistry {
'.' +
self.dataStore.getRootDomain() +
':' +
CaptainConstants.registrySubDomainPort);
CaptainConstants.configs.registrySubDomainPort);
}
ensureServiceRemoved() {
const dockerApi = this.dockerApi;
@@ -66,7 +66,7 @@ class DockerRegistry {
{
protocol: 'tcp',
containerPort: 5000,
hostPort: CaptainConstants.registrySubDomainPort,
hostPort: CaptainConstants.configs.registrySubDomainPort,
},
], myNodeId, [
{
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"DockerRegistry.js","sourceRoot":"","sources":["../../src/user/DockerRegistry.ts"],"names":[],"mappings":"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"}
{"version":3,"file":"DockerRegistry.js","sourceRoot":"","sources":["../../src/user/DockerRegistry.ts"],"names":[],"mappings":"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"}
+1 -1
View File
@@ -71,7 +71,7 @@ class ImageMaker {
this.activeBuilds[appName] = true;
this.buildLogs[appName] =
this.buildLogs[appName] ||
new BuildLog(CaptainConstants.buildLogSize);
new BuildLog(CaptainConstants.configs.buildLogSize);
this.buildLogs[appName].clear();
this.buildLogs[appName].log('------------------------- ' + new Date());
this.buildLogs[appName].log('Build started for ' + appName);
File diff suppressed because one or more lines are too long
+2 -2
View File
@@ -386,7 +386,7 @@ class ServiceManager {
const self = this;
this.buildLogs[appName] =
this.buildLogs[appName] ||
new BuildLog(CaptainConstants.buildLogSize);
new BuildLog(CaptainConstants.configs.buildLogSize);
return {
isAppBuilding: self.isAppBuilding(appName),
logs: self.buildLogs[appName].getLogs(),
@@ -397,7 +397,7 @@ class ServiceManager {
error = (error || '') + '';
this.buildLogs[appName] =
this.buildLogs[appName] ||
new BuildLog(CaptainConstants.buildLogSize);
new BuildLog(CaptainConstants.configs.buildLogSize);
this.buildLogs[appName].onBuildFailed(error);
}
ensureServiceInitedAndUpdated(appName) {
File diff suppressed because one or more lines are too long
+12 -9
View File
@@ -6,9 +6,17 @@ const CAPTAIN_DATA_DIRECTORY = +CAPTAIN_BASE_DIRECTORY + '/data'; // data that s
const CAPTAIN_ROOT_DIRECTORY_TEMP = CAPTAIN_BASE_DIRECTORY + '/temp';
const CAPTAIN_ROOT_DIRECTORY_GENERATED = CAPTAIN_BASE_DIRECTORY + '/generated';
const CONSTANT_FILE_OVERRIDE = CAPTAIN_DATA_DIRECTORY + '/constants.json';
const configs = {
publishedNameOnDockerHub: 'dockersaturn/captainduckduck',
defaultMaxLogSize: '512m',
buildLogSize: 50,
preCheckForWildCard: true,
registrySubDomainPort: 996,
};
let data = {
configs: configs,
// ******************** Global Constants *********************
apiVersion: 'v1',
apiVersion: 'v2',
version: '0.7.3',
isDebug: EnvVars.CAPTAIN_IS_DEBUG,
captainServiceExposedPort: 3000,
@@ -17,9 +25,10 @@ let data = {
dockerSocketPath: '/var/run/docker.sock',
sourcePathInContainer: '/usr/src/app',
nginxStaticRootDir: '/usr/share/nginx',
captainStaticFilesDir: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/static',
nginxSharedPathOnNginx: '/nginx-shared',
nginxDefaultHtmlDir: '/default',
letsEncryptEtcPathOnNginx: '/letencrypt/etc',
nginxSharedPathOnNginx: '/nginx-shared',
nginxDomainSpecificHtmlDir: '/domains',
captainConfirmationPath: '/.well-known/captain-identifier',
captainBaseDirectory: CAPTAIN_BASE_DIRECTORY,
@@ -27,7 +36,6 @@ let data = {
captainRawSourceDirectoryBase: CAPTAIN_ROOT_DIRECTORY_TEMP + '/image_raw',
captainRootDirectoryGenerated: CAPTAIN_ROOT_DIRECTORY_GENERATED,
registryAuthPathOnHost: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/registry-auth',
captainStaticFilesDir: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/static',
baseNginxConfigPath: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/nginx/nginx.conf',
rootNginxConfigPath: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/nginx/conf.d/captain-root',
perAppNginxConfigPathBase: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/nginx/conf.d',
@@ -38,7 +46,6 @@ let data = {
nginxSharedPathOnHost: CAPTAIN_DATA_DIRECTORY + '/nginx-shared',
debugSourceDirectory: '',
// **************** DockerHub Image Names ********************
publishedNameOnDockerHub: 'dockersaturn/captainduckduck',
certbotImageName: 'dockersaturn/certbot-sleeping:v0.17.0',
netDataImageName: 'titpetric/netdata:1.8',
registryImageName: 'registry:2',
@@ -46,8 +53,6 @@ let data = {
nginxImageName: 'nginx',
// ********************* Local Docker Constants ************************
defaultEmail: 'runner@captainduckduck.com',
defaultMaxLogSize: '512m',
buildLogSize: 50,
captainSaltSecretKey: 'captain-salt',
nginxServiceName: 'captain-nginx',
captainServiceName: 'captain-captain',
@@ -57,9 +62,7 @@ let data = {
captainNetworkName: 'captain-overlay-network',
captainRegistryUsername: 'captain',
// ********************* HTTP Related Constants ************************
preCheckForWildCard: true,
nginxPortNumber: 80,
registrySubDomainPort: 996,
netDataRelativePath: '/net-data-monitor',
healthCheckEndPoint: '/checkhealth',
captainSubDomain: 'captain',
@@ -90,7 +93,7 @@ if (data.isDebug) {
throw new Error('For development purposes, you need to assign your local directory here');
}
data.debugSourceDirectory = devDirectoryOnLocalMachine;
data.publishedNameOnDockerHub = 'captain-debug';
data.configs.publishedNameOnDockerHub = 'captain-debug';
data.nginxPortNumber = 80;
}
module.exports = data;
@@ -1 +1 @@
{"version":3,"file":"CaptainConstants.js","sourceRoot":"","sources":["../../src/utils/CaptainConstants.ts"],"names":[],"mappings":"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"}
{"version":3,"file":"CaptainConstants.js","sourceRoot":"","sources":["../../src/utils/CaptainConstants.ts"],"names":[],"mappings":"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"}
+2 -2
View File
@@ -230,12 +230,12 @@ function install() {
});
}
let ports = [];
let captainNameAndVersion = CaptainConstants.publishedNameOnDockerHub +
let captainNameAndVersion = CaptainConstants.configs.publishedNameOnDockerHub +
':' +
CaptainConstants.version;
if (CaptainConstants.isDebug) {
captainNameAndVersion =
CaptainConstants.publishedNameOnDockerHub; // debug doesn't have version.
CaptainConstants.configs.publishedNameOnDockerHub; // debug doesn't have version.
env.push({
key: EnvVar.keys.CAPTAIN_IS_DEBUG,
value: EnvVar.CAPTAIN_IS_DEBUG + '',
File diff suppressed because one or more lines are too long
+2 -2
View File
@@ -471,7 +471,7 @@ class DockerApi {
LogConfig: {
Type: 'json-file',
Config: {
'max-size': CaptainConstants.defaultMaxLogSize,
'max-size': CaptainConstants.configs.defaultMaxLogSize,
},
},
RestartPolicy: {
@@ -638,7 +638,7 @@ class DockerApi {
LogDriver: {
Name: 'json-file',
Options: {
'max-size': CaptainConstants.defaultMaxLogSize,
'max-size': CaptainConstants.configs.defaultMaxLogSize,
},
},
},
+3 -3
View File
@@ -398,7 +398,7 @@ class CaptainManager {
getCaptainImageTags() {
const url =
'https://hub.docker.com/v2/repositories/' +
CaptainConstants.publishedNameOnDockerHub +
CaptainConstants.configs.publishedNameOnDockerHub +
'/tags'
return new Promise<string[]>(function(resolve, reject) {
@@ -437,7 +437,7 @@ class CaptainManager {
return Promise.resolve().then(function() {
return self.dockerApi.updateService(
CaptainConstants.captainServiceName,
CaptainConstants.publishedNameOnDockerHub + ':' + versionTag,
CaptainConstants.configs.publishedNameOnDockerHub + ':' + versionTag,
undefined,
undefined,
undefined,
@@ -925,7 +925,7 @@ class CaptainManager {
// We still allow users to specify the domains in their DNS settings individually
// SubDomains that need to be added are "captain." "registry." "app-name."
const url =
(CaptainConstants.preCheckForWildCard
(CaptainConstants.configs.preCheckForWildCard
? uuid()
: CaptainConstants.captainSubDomain) +
'.' +
+2 -2
View File
@@ -64,7 +64,7 @@ class DockerRegistry {
'.' +
self.dataStore.getRootDomain() +
':' +
CaptainConstants.registrySubDomainPort
CaptainConstants.configs.registrySubDomainPort
)
}
@@ -100,7 +100,7 @@ class DockerRegistry {
{
protocol: 'tcp',
containerPort: 5000,
hostPort: CaptainConstants.registrySubDomainPort,
hostPort: CaptainConstants.configs.registrySubDomainPort,
},
],
myNodeId,
+1 -1
View File
@@ -83,7 +83,7 @@ class ImageMaker {
this.activeBuilds[appName] = true
this.buildLogs[appName] =
this.buildLogs[appName] ||
new BuildLog(CaptainConstants.buildLogSize)
new BuildLog(CaptainConstants.configs.buildLogSize)
this.buildLogs[appName].clear()
this.buildLogs[appName].log('------------------------- ' + new Date())
+2 -2
View File
@@ -541,7 +541,7 @@ class ServiceManager {
const self = this
this.buildLogs[appName] =
this.buildLogs[appName] ||
new BuildLog(CaptainConstants.buildLogSize)
new BuildLog(CaptainConstants.configs.buildLogSize)
return {
isAppBuilding: self.isAppBuilding(appName),
@@ -554,7 +554,7 @@ class ServiceManager {
error = (error || '') + ''
this.buildLogs[appName] =
this.buildLogs[appName] ||
new BuildLog(CaptainConstants.buildLogSize)
new BuildLog(CaptainConstants.configs.buildLogSize)
this.buildLogs[appName].onBuildFailed(error)
}
+21 -17
View File
@@ -8,10 +8,24 @@ const CAPTAIN_ROOT_DIRECTORY_GENERATED = CAPTAIN_BASE_DIRECTORY + '/generated'
const CONSTANT_FILE_OVERRIDE = CAPTAIN_DATA_DIRECTORY + '/constants.json'
const configs = {
publishedNameOnDockerHub: 'dockersaturn/captainduckduck',
defaultMaxLogSize: '512m',
buildLogSize: 50,
preCheckForWildCard: true,
registrySubDomainPort: 996,
}
let data = {
configs: configs, // values that can be overridden
// ******************** Global Constants *********************
apiVersion: 'v1',
apiVersion: 'v2',
version: '0.7.3',
@@ -29,12 +43,14 @@ let data = {
nginxStaticRootDir: '/usr/share/nginx',
captainStaticFilesDir: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/static',
nginxSharedPathOnNginx: '/nginx-shared',
nginxDefaultHtmlDir: '/default',
letsEncryptEtcPathOnNginx: '/letencrypt/etc',
nginxSharedPathOnNginx: '/nginx-shared',
nginxDomainSpecificHtmlDir: '/domains',
captainConfirmationPath: '/.well-known/captain-identifier',
@@ -49,9 +65,7 @@ let data = {
registryAuthPathOnHost: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/registry-auth', // this is a file
captainStaticFilesDir: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/static',
baseNginxConfigPath: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/nginx/nginx.conf',
baseNginxConfigPath: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/nginx/nginx.conf', // this is a file
rootNginxConfigPath:
CAPTAIN_ROOT_DIRECTORY_GENERATED + '/nginx/conf.d/captain-root',
@@ -73,8 +87,6 @@ let data = {
// **************** DockerHub Image Names ********************
publishedNameOnDockerHub: 'dockersaturn/captainduckduck',
certbotImageName: 'dockersaturn/certbot-sleeping:v0.17.0',
netDataImageName: 'titpetric/netdata:1.8',
@@ -89,10 +101,6 @@ let data = {
defaultEmail: 'runner@captainduckduck.com',
defaultMaxLogSize: '512m',
buildLogSize: 50,
captainSaltSecretKey: 'captain-salt',
nginxServiceName: 'captain-nginx',
@@ -111,12 +119,8 @@ let data = {
// ********************* HTTP Related Constants ************************
preCheckForWildCard: true,
nginxPortNumber: 80,
registrySubDomainPort: 996,
netDataRelativePath: '/net-data-monitor',
healthCheckEndPoint: '/checkhealth',
@@ -161,7 +165,7 @@ if (data.isDebug) {
}
data.debugSourceDirectory = devDirectoryOnLocalMachine
data.publishedNameOnDockerHub = 'captain-debug'
data.configs.publishedNameOnDockerHub = 'captain-debug'
data.nginxPortNumber = 80
}
+2 -2
View File
@@ -284,13 +284,13 @@ export function install() {
let ports: IAppPort[] = []
let captainNameAndVersion =
CaptainConstants.publishedNameOnDockerHub +
CaptainConstants.configs.publishedNameOnDockerHub +
':' +
CaptainConstants.version
if (CaptainConstants.isDebug) {
captainNameAndVersion =
CaptainConstants.publishedNameOnDockerHub // debug doesn't have version.
CaptainConstants.configs.publishedNameOnDockerHub // debug doesn't have version.
env.push({
key: EnvVar.keys.CAPTAIN_IS_DEBUG,