Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
80f35c39aa | |||
87f55773bd | |||
1a25341232 | |||
ccd41d86bf |
2
package-lock.json
generated
2
package-lock.json
generated
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@pushrocks/qenv",
|
"name": "@pushrocks/qenv",
|
||||||
"version": "3.0.3",
|
"version": "3.0.5",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@pushrocks/qenv",
|
"name": "@pushrocks/qenv",
|
||||||
"version": "3.0.3",
|
"version": "3.0.5",
|
||||||
"private": false,
|
"private": false,
|
||||||
"description": "easy promised environments",
|
"description": "easy promised environments",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
|
@ -74,7 +74,6 @@ export class Qenv {
|
|||||||
try {
|
try {
|
||||||
envYml = plugins.smartfile.fs.toObjectSync(this.envFilePathAbsolute);
|
envYml = plugins.smartfile.fs.toObjectSync(this.envFilePathAbsolute);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.log("env file couldn't be found at " + this.envFilePathAbsolute);
|
|
||||||
envYml = {};
|
envYml = {};
|
||||||
}
|
}
|
||||||
let envVar: string;
|
let envVar: string;
|
||||||
@ -98,7 +97,7 @@ export class Qenv {
|
|||||||
if (
|
if (
|
||||||
plugins.smartfile.fs.isDirectory('/run') &&
|
plugins.smartfile.fs.isDirectory('/run') &&
|
||||||
plugins.smartfile.fs.isDirectory('/run/secrets') &&
|
plugins.smartfile.fs.isDirectory('/run/secrets') &&
|
||||||
plugins.smartfile.fs.fileExists(`/run/secrets/${requiredEnvVar}`)
|
plugins.smartfile.fs.fileExistsSync(`/run/secrets/${requiredEnvVar}`)
|
||||||
) {
|
) {
|
||||||
dockerSecret = plugins.smartfile.fs.toStringSync(`/run/secrets/${requiredEnvVar}`);
|
dockerSecret = plugins.smartfile.fs.toStringSync(`/run/secrets/${requiredEnvVar}`);
|
||||||
}
|
}
|
||||||
@ -107,7 +106,7 @@ export class Qenv {
|
|||||||
if (
|
if (
|
||||||
plugins.smartfile.fs.isDirectory('/run') &&
|
plugins.smartfile.fs.isDirectory('/run') &&
|
||||||
plugins.smartfile.fs.isDirectory('/run/secrets') &&
|
plugins.smartfile.fs.isDirectory('/run/secrets') &&
|
||||||
plugins.smartfile.fs.fileExists(`/run/secrets/secret.json`)
|
plugins.smartfile.fs.fileExistsSync(`/run/secrets/secret.json`)
|
||||||
) {
|
) {
|
||||||
const secretObject = plugins.smartfile.fs.toObjectSync('/run/secrets/secret.json');
|
const secretObject = plugins.smartfile.fs.toObjectSync('/run/secrets/secret.json');
|
||||||
dockerSecret = secretObject[requiredEnvVar];
|
dockerSecret = secretObject[requiredEnvVar];
|
||||||
@ -129,12 +128,16 @@ export class Qenv {
|
|||||||
|
|
||||||
let chosenVar: string = null;
|
let chosenVar: string = null;
|
||||||
if (envVar) {
|
if (envVar) {
|
||||||
|
this.logger.log('ok', `found ${requiredEnvVar} as environment variable`);
|
||||||
chosenVar = envVar;
|
chosenVar = envVar;
|
||||||
} else if (envFileVar) {
|
} else if (envFileVar) {
|
||||||
|
this.logger.log('ok', `found ${requiredEnvVar} as env.yml variable`);
|
||||||
chosenVar = envFileVar;
|
chosenVar = envFileVar;
|
||||||
} else if (dockerSecret) {
|
} else if (dockerSecret) {
|
||||||
|
this.logger.log('ok', `found ${requiredEnvVar} as docker secret`);
|
||||||
chosenVar = dockerSecret;
|
chosenVar = dockerSecret;
|
||||||
} else if (dockerSecretJson) {
|
} else if (dockerSecretJson) {
|
||||||
|
this.logger.log('ok', `found ${requiredEnvVar} as docker secret.json`);
|
||||||
chosenVar = dockerSecretJson;
|
chosenVar = dockerSecretJson;
|
||||||
}
|
}
|
||||||
return chosenVar;
|
return chosenVar;
|
||||||
|
Reference in New Issue
Block a user