diff --git a/dist/mod_docker/index.d.ts b/dist/mod_docker/index.d.ts
index d7417f4..a5bf0f2 100644
--- a/dist/mod_docker/index.d.ts
+++ b/dist/mod_docker/index.d.ts
@@ -1,111 +1,20 @@
-///
+import * as helpers from './mod.helpers';
+import { Dockerfile } from './mod.classes.dockerfile';
+export { Dockerfile, helpers };
export declare let modArgvArg: any;
/**
* handle cli input
* @param argvArg
*/
export declare let handleCli: (argvArg: any) => Promise;
-/**
- * logs in docker
- */
-export declare let prepare: () => Promise;
/**
* builds a cwd of Dockerfiles by triggering a promisechain
*/
export declare let build: () => Promise;
-export declare let push: () => Promise;
-export declare let pull: () => Promise;
+/**
+ * logs in docker
+ */
+export declare let prepare: () => Promise;
+export declare let push: (argvArg: any) => Promise;
+export declare let pull: (argvArg: any) => Promise;
export declare let test: () => Promise;
-/**
- * creates instance of class Dockerfile for all Dockerfiles in cwd
- * @returns Promise
- */
-export declare let readDockerfiles: () => Promise;
-/**
- * sorts Dockerfiles into a dependency chain
- * @param sortableArrayArg an array of instances of class Dockerfile
- * @returns Promise
- */
-export declare let sortDockerfiles: (sortableArrayArg: Dockerfile[]) => Promise;
-/**
- * maps local Dockerfiles dependencies to the correspoding Dockerfile class instances
- */
-export declare let mapDockerfiles: (sortedArray: Dockerfile[]) => Promise;
-/**
- * builds the correspoding real docker image for each Dockerfile class instance
- */
-export declare let buildDockerfiles: (sortedArrayArg: Dockerfile[]) => Promise;
-/**
- * pushes the real Dockerfile images to a Docker registry
- */
-export declare let pushDockerfiles: (sortedArrayArg: Dockerfile[]) => Promise;
-/**
- * pulls corresponding real Docker images for instances of Dockerfile from a registry.
- * This is needed if building, testing, and publishing of Docker images is carried out in seperate CI stages.
- */
-export declare let pullDockerfileImages: (sortableArrayArg: Dockerfile[], registryArg?: string) => Promise;
-/**
- * tests all Dockerfiles in by calling class Dockerfile.test();
- * @param sortedArrayArg Dockerfile[] that contains all Dockerfiles in cwd
- */
-export declare let testDockerfiles: (sortedArrayArg: Dockerfile[]) => Promise;
-/**
- * class Dockerfile represents a Dockerfile on disk in npmci
- */
-export declare class Dockerfile {
- filePath: string;
- repo: string;
- version: string;
- cleanTag: string;
- buildTag: string;
- gitlabTestTag: string;
- gitlabReleaseTag: string;
- releaseTag: string;
- containerName: string;
- content: string;
- baseImage: string;
- localBaseImageDependent: boolean;
- localBaseDockerfile: Dockerfile;
- constructor(options: {
- filePath?: string;
- fileContents?: string | Buffer;
- read?: boolean;
- });
- /**
- * builds the Dockerfile
- */
- build(): Promise;
- /**
- * pushes the Dockerfile to a registry
- */
- push(stageArg: any): Promise;
- /**
- * pulls the Dockerfile from a registry
- */
- pull(registryArg: string): Promise;
- /**
- * tests the Dockerfile;
- */
- test(): Promise;
- /**
- * gets the id of a Dockerfile
- */
- getId(): Promise;
-}
-/**
- * returns a version for a docker file
- * @execution SYNC
- */
-export declare let dockerFileVersion: (dockerfileNameArg: string) => string;
-/**
- * returns the docker base image for a Dockerfile
- */
-export declare let dockerBaseImage: (dockerfileContentArg: string) => string;
-/**
- * returns the docker tag
- */
-export declare let getDockerTagString: (registryArg: string, repoArg: string, versionArg: string, suffixArg?: string) => string;
-/**
- *
- */
-export declare let cleanTagsArrayFunction: (dockerfileArrayArg: Dockerfile[], trackingArrayArg: Dockerfile[]) => string[];
diff --git a/dist/mod_docker/index.js b/dist/mod_docker/index.js
index 9dde4e1..9894c80 100644
--- a/dist/mod_docker/index.js
+++ b/dist/mod_docker/index.js
@@ -9,9 +9,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
};
Object.defineProperty(exports, "__esModule", { value: true });
const plugins = require("./mod.plugins");
-const paths = require("../npmci.paths");
const NpmciEnv = require("../npmci.env");
-const npmci_bash_1 = require("../npmci.bash");
+const helpers = require("./mod.helpers");
+exports.helpers = helpers;
+// classes
+const mod_classes_dockerfile_1 = require("./mod.classes.dockerfile");
+exports.Dockerfile = mod_classes_dockerfile_1.Dockerfile;
+const mod_classes_dockerregistry_1 = require("./mod.classes.dockerregistry");
+const mod_classes_registrystorage_1 = require("./mod.classes.registrystorage");
+// instances
+let npmciRegistryStorage = new mod_classes_registrystorage_1.RegistryStorage();
/**
* handle cli input
* @param argvArg
@@ -30,6 +37,12 @@ exports.handleCli = (argvArg) => __awaiter(this, void 0, void 0, function* () {
case 'test':
yield exports.test();
break;
+ case 'push':
+ yield exports.push(argvArg);
+ break;
+ case 'pull':
+ yield exports.pull(argvArg);
+ break;
default:
plugins.beautylog.error(`>>npmci node ...<< action >>${action}<< not supported`);
}
@@ -38,321 +51,68 @@ exports.handleCli = (argvArg) => __awaiter(this, void 0, void 0, function* () {
plugins.beautylog.log(`>>npmci node ...<< cli arguments invalid... Please read the documentation.`);
}
});
+/**
+ * builds a cwd of Dockerfiles by triggering a promisechain
+ */
+exports.build = () => __awaiter(this, void 0, void 0, function* () {
+ plugins.beautylog.log('now building Dockerfiles...');
+ yield helpers.readDockerfiles()
+ .then(helpers.sortDockerfiles)
+ .then(helpers.mapDockerfiles)
+ .then(helpers.buildDockerfiles);
+});
/**
* logs in docker
*/
exports.prepare = () => __awaiter(this, void 0, void 0, function* () {
NpmciEnv.setDockerRegistry('docker.io'); // TODO: checkup why we set this here
- // handle registries
- plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_LOGIN_DOCKER*', (envString) => __awaiter(this, void 0, void 0, function* () {
- let dockerRegexResultArray = envString.split('|');
- if (dockerRegexResultArray.length !== 3) {
- plugins.beautylog.error('malformed docker env var...');
- process.exit(1);
- return;
- }
- let registry = dockerRegexResultArray[0];
- let username = dockerRegexResultArray[1];
- let password = dockerRegexResultArray[2];
- if (registry === 'docker.io') {
- yield npmci_bash_1.bash(`docker login -u ${username} -p ${password}`);
- plugins.beautylog.info('Logged in to standard docker hub');
- }
- else {
- yield npmci_bash_1.bash(`docker login -u ${username} -p ${password} ${registry}`);
- }
- plugins.beautylog.success(`docker authenticated for ${registry}!`);
- }));
// Always login to GitLab Registry
if (!process.env.CI_BUILD_TOKEN || process.env.CI_BUILD_TOKEN === '') {
plugins.beautylog.error('No registry token specified by gitlab!');
return;
}
- yield npmci_bash_1.bash(`docker login -u gitlab-ci-token -p ${process.env.CI_BUILD_TOKEN} registry.gitlab.com`);
- plugins.beautylog.success(`docker authenticated for registry.gitlab.com!`);
+ npmciRegistryStorage.addRegistry(new mod_classes_dockerregistry_1.DockerRegistry({
+ registryUrl: 'registry.gitlab.com',
+ username: 'gitlab-ci-token',
+ password: process.env.CI_BUILD_TOKEN
+ }));
+ // handle registries
+ plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_LOGIN_DOCKER*', (envString) => __awaiter(this, void 0, void 0, function* () {
+ npmciRegistryStorage.addRegistry(mod_classes_dockerregistry_1.DockerRegistry.fromEnvString(envString));
+ yield npmciRegistryStorage.loginAll();
+ }));
return;
});
-/**
- * builds a cwd of Dockerfiles by triggering a promisechain
- */
-exports.build = () => __awaiter(this, void 0, void 0, function* () {
- plugins.beautylog.log('now building Dockerfiles...');
- yield exports.readDockerfiles()
- .then(exports.sortDockerfiles)
- .then(exports.mapDockerfiles)
- .then(exports.buildDockerfiles);
+exports.push = (argvArg) => __awaiter(this, void 0, void 0, function* () {
+ let registryUrlArg = argvArg._[2];
+ let suffix = null;
+ if (argvArg._.length >= 4) {
+ suffix = argvArg._[3];
+ }
+ let dockerfileArray = yield helpers.readDockerfiles()
+ .then(helpers.sortDockerfiles)
+ .then(helpers.mapDockerfiles);
+ let localDockerRegistry = npmciRegistryStorage.getRegistryByUrl(registryUrlArg);
+ for (let dockerfile of dockerfileArray) {
+ dockerfile.push(localDockerRegistry, suffix);
+ }
});
-exports.push = () => __awaiter(this, void 0, void 0, function* () {
- yield exports.readDockerfiles()
- .then(exports.sortDockerfiles)
- .then(exports.mapDockerfiles)
- .then(exports.pushDockerfiles);
-});
-exports.pull = () => __awaiter(this, void 0, void 0, function* () {
- return yield exports.readDockerfiles()
- .then(exports.pullDockerfileImages);
+exports.pull = (argvArg) => __awaiter(this, void 0, void 0, function* () {
+ let registryUrlArg = argvArg._[2];
+ let suffix = null;
+ if (argvArg._.length >= 4) {
+ suffix = argvArg._[3];
+ }
+ let localDockerRegistry = npmciRegistryStorage.getRegistryByUrl(registryUrlArg);
+ let dockerfileArray = yield helpers.readDockerfiles()
+ .then(helpers.sortDockerfiles)
+ .then(helpers.mapDockerfiles);
+ for (let dockerfile of dockerfileArray) {
+ dockerfile.pull(localDockerRegistry, suffix);
+ }
});
exports.test = () => __awaiter(this, void 0, void 0, function* () {
- return yield exports.readDockerfiles()
- .then(exports.testDockerfiles);
+ return yield helpers.readDockerfiles()
+ .then(helpers.testDockerfiles);
});
-/**
- * creates instance of class Dockerfile for all Dockerfiles in cwd
- * @returns Promise
- */
-exports.readDockerfiles = () => __awaiter(this, void 0, void 0, function* () {
- let fileTree = yield plugins.smartfile.fs.listFileTree(paths.cwd, 'Dockerfile*');
- // create the Dockerfile array
- let readDockerfilesArray = [];
- plugins.beautylog.info(`found ${fileTree.length} Dockerfiles:`);
- console.log(fileTree);
- for (let dockerfilePath of fileTree) {
- let myDockerfile = new Dockerfile({
- filePath: dockerfilePath,
- read: true
- });
- readDockerfilesArray.push(myDockerfile);
- }
- return readDockerfilesArray;
-});
-/**
- * sorts Dockerfiles into a dependency chain
- * @param sortableArrayArg an array of instances of class Dockerfile
- * @returns Promise
- */
-exports.sortDockerfiles = (sortableArrayArg) => {
- let done = plugins.q.defer();
- plugins.beautylog.info('sorting Dockerfiles:');
- let sortedArray = [];
- let cleanTagsOriginal = exports.cleanTagsArrayFunction(sortableArrayArg, sortedArray);
- let sorterFunctionCounter = 0;
- let sorterFunction = function () {
- sortableArrayArg.forEach((dockerfileArg) => {
- let cleanTags = exports.cleanTagsArrayFunction(sortableArrayArg, sortedArray);
- if (cleanTags.indexOf(dockerfileArg.baseImage) === -1 && sortedArray.indexOf(dockerfileArg) === -1) {
- sortedArray.push(dockerfileArg);
- }
- if (cleanTagsOriginal.indexOf(dockerfileArg.baseImage) !== -1) {
- dockerfileArg.localBaseImageDependent = true;
- }
- });
- if (sortableArrayArg.length === sortedArray.length) {
- let counter = 1;
- for (let dockerfile of sortedArray) {
- plugins.beautylog.log(`tag ${counter}: -> ${dockerfile.cleanTag}`);
- counter++;
- }
- done.resolve(sortedArray);
- }
- else if (sorterFunctionCounter < 10) {
- sorterFunctionCounter++;
- sorterFunction();
- }
- };
- sorterFunction();
- return done.promise;
-};
-/**
- * maps local Dockerfiles dependencies to the correspoding Dockerfile class instances
- */
-exports.mapDockerfiles = (sortedArray) => __awaiter(this, void 0, void 0, function* () {
- sortedArray.forEach((dockerfileArg) => {
- if (dockerfileArg.localBaseImageDependent) {
- sortedArray.forEach((dockfile2) => {
- if (dockfile2.cleanTag === dockerfileArg.baseImage) {
- dockerfileArg.localBaseDockerfile = dockfile2;
- }
- });
- }
- });
- return sortedArray;
-});
-/**
- * builds the correspoding real docker image for each Dockerfile class instance
- */
-exports.buildDockerfiles = (sortedArrayArg) => __awaiter(this, void 0, void 0, function* () {
- for (let dockerfileArg of sortedArrayArg) {
- yield dockerfileArg.build();
- }
- return sortedArrayArg;
-});
-/**
- * pushes the real Dockerfile images to a Docker registry
- */
-exports.pushDockerfiles = (sortedArrayArg) => __awaiter(this, void 0, void 0, function* () {
- let stageArg = (function () {
- if (exports.modArgvArg._ && exports.modArgvArg._.length >= 3) {
- return exports.modArgvArg._[2];
- }
- else {
- return NpmciEnv.buildStage;
- }
- })();
- for (let dockerfileArg of sortedArrayArg) {
- yield dockerfileArg.push(stageArg);
- }
- return sortedArrayArg;
-});
-/**
- * pulls corresponding real Docker images for instances of Dockerfile from a registry.
- * This is needed if building, testing, and publishing of Docker images is carried out in seperate CI stages.
- */
-exports.pullDockerfileImages = (sortableArrayArg, registryArg = 'registry.gitlab.com') => __awaiter(this, void 0, void 0, function* () {
- for (let dockerfileArg of sortableArrayArg) {
- yield dockerfileArg.pull(registryArg);
- }
- return sortableArrayArg;
-});
-/**
- * tests all Dockerfiles in by calling class Dockerfile.test();
- * @param sortedArrayArg Dockerfile[] that contains all Dockerfiles in cwd
- */
-exports.testDockerfiles = (sortedArrayArg) => __awaiter(this, void 0, void 0, function* () {
- for (let dockerfileArg of sortedArrayArg) {
- yield dockerfileArg.test();
- }
- return sortedArrayArg;
-});
-/**
- * class Dockerfile represents a Dockerfile on disk in npmci
- */
-class Dockerfile {
- constructor(options) {
- this.filePath = options.filePath;
- this.repo = NpmciEnv.repo.user + '/' + NpmciEnv.repo.repo;
- this.version = exports.dockerFileVersion(plugins.path.parse(options.filePath).base);
- this.cleanTag = this.repo + ':' + this.version;
- this.buildTag = this.cleanTag;
- this.gitlabTestTag = exports.getDockerTagString('docker.io', this.repo, this.version, 'test'); // TODO: using docker.io until gitlab is fixed
- this.gitlabReleaseTag = exports.getDockerTagString('docker.io', this.repo, this.version); // TODO: using docker.io until gitlab is fixed
- // the releaseTag determines where the image gets released
- this.releaseTag = exports.getDockerTagString('docker.io', this.repo, this.version);
- this.containerName = 'dockerfile-' + this.version;
- if (options.filePath && options.read) {
- this.content = plugins.smartfile.fs.toStringSync(plugins.path.resolve(options.filePath));
- }
- this.baseImage = exports.dockerBaseImage(this.content);
- this.localBaseImageDependent = false;
- }
- /**
- * builds the Dockerfile
- */
- build() {
- return __awaiter(this, void 0, void 0, function* () {
- plugins.beautylog.info('now building Dockerfile for ' + this.cleanTag);
- let buildCommand = `docker build -t ${this.buildTag} -f ${this.filePath} .`;
- yield npmci_bash_1.bash(buildCommand);
- NpmciEnv.dockerFilesBuilt.push(this);
- return;
- });
- }
- /**
- * pushes the Dockerfile to a registry
- */
- push(stageArg) {
- return __awaiter(this, void 0, void 0, function* () {
- yield npmci_bash_1.bash(`docker tag ${this.buildTag} ${this.releaseTag}`);
- yield npmci_bash_1.bash(`docker tag ${this.buildTag} ${this.gitlabReleaseTag}`);
- yield npmci_bash_1.bash(`docker tag ${this.buildTag} ${this.gitlabTestTag}`);
- switch (stageArg) {
- case 'release':
- yield npmci_bash_1.bash(`docker push ${this.gitlabReleaseTag}`);
- yield npmci_bash_1.bash(`docker push ${this.releaseTag}`);
- break;
- case 'test':
- default:
- yield npmci_bash_1.bash(`docker push ${this.gitlabTestTag}`);
- break;
- }
- });
- }
- /**
- * pulls the Dockerfile from a registry
- */
- pull(registryArg) {
- return __awaiter(this, void 0, void 0, function* () {
- yield npmci_bash_1.bash(`docker pull ${this.gitlabTestTag}`);
- yield npmci_bash_1.bash(`docker tag ${this.gitlabTestTag} ${this.buildTag}`);
- });
- }
- /**
- * tests the Dockerfile;
- */
- test() {
- return __awaiter(this, void 0, void 0, function* () {
- let testFile = plugins.path.join(paths.NpmciTestDir, 'test_' + this.version + '.sh');
- let testFileExists = plugins.smartfile.fs.fileExistsSync(testFile);
- if (testFileExists) {
- // run tests
- yield npmci_bash_1.bash('docker run --name npmci_test_container ' + this.buildTag + ' mkdir /npmci_test');
- yield npmci_bash_1.bash('docker cp ' + testFile + ' npmci_test_container:/npmci_test/test.sh');
- yield npmci_bash_1.bash('docker commit npmci_test_container npmci_test_image');
- yield npmci_bash_1.bash('docker run npmci_test_image sh /npmci_test/test.sh');
- yield npmci_bash_1.bash('docker rm npmci_test_container');
- yield npmci_bash_1.bash('docker rmi --force npmci_test_image');
- }
- else {
- plugins.beautylog.warn('skipping tests for ' + this.cleanTag + ' because no testfile was found!');
- }
- });
- }
- /**
- * gets the id of a Dockerfile
- */
- getId() {
- return __awaiter(this, void 0, void 0, function* () {
- let containerId = yield npmci_bash_1.bash('docker inspect --type=image --format=\"{{.Id}}\" ' + this.buildTag);
- return containerId;
- });
- }
-}
-exports.Dockerfile = Dockerfile;
-/**
- * returns a version for a docker file
- * @execution SYNC
- */
-exports.dockerFileVersion = (dockerfileNameArg) => {
- let versionString;
- let versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/;
- let regexResultArray = versionRegex.exec(dockerfileNameArg);
- if (regexResultArray && regexResultArray.length === 2) {
- versionString = regexResultArray[1];
- }
- else {
- versionString = 'latest';
- }
- return versionString;
-};
-/**
- * returns the docker base image for a Dockerfile
- */
-exports.dockerBaseImage = function (dockerfileContentArg) {
- let baseImageRegex = /FROM\s([a-zA-z0-9\/\-\:]*)\n?/;
- let regexResultArray = baseImageRegex.exec(dockerfileContentArg);
- return regexResultArray[1];
-};
-/**
- * returns the docker tag
- */
-exports.getDockerTagString = function (registryArg, repoArg, versionArg, suffixArg) {
- // determine wether the suffix is needed
- let version = versionArg;
- if (suffixArg) {
- version = versionArg + '_' + suffixArg;
- }
- let tagString = `${registryArg}/${repoArg}:${version}`;
- return tagString;
-};
-/**
- *
- */
-exports.cleanTagsArrayFunction = function (dockerfileArrayArg, trackingArrayArg) {
- let cleanTagsArray = [];
- dockerfileArrayArg.forEach(function (dockerfileArg) {
- if (trackingArrayArg.indexOf(dockerfileArg) === -1) {
- cleanTagsArray.push(dockerfileArg.cleanTag);
- }
- });
- return cleanTagsArray;
-};
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/mod_docker/index.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfZG9ja2VyL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSx5Q0FBd0M7QUFFeEMseUNBQXdDO0FBR3hDLHlDQUF3QztBQVl0QywwQkFBTztBQVZULFVBQVU7QUFDVixxRUFBcUQ7QUFRbkQscUJBUk8sbUNBQVUsQ0FRUDtBQVBaLDZFQUE2RDtBQUM3RCwrRUFBK0Q7QUFFL0QsWUFBWTtBQUNaLElBQUksb0JBQW9CLEdBQUcsSUFBSSw2Q0FBZSxFQUFFLENBQUE7QUFTaEQ7OztHQUdHO0FBQ1EsUUFBQSxTQUFTLEdBQUcsQ0FBTyxPQUFPO0lBQ25DLGtCQUFVLEdBQUcsT0FBTyxDQUFBO0lBQ3BCLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsTUFBTSxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDMUIsSUFBSSxNQUFNLEdBQVcsT0FBTyxDQUFDLENBQUMsQ0FBRSxDQUFDLENBQUUsQ0FBQTtRQUNuQyxNQUFNLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQ2YsS0FBSyxPQUFPO2dCQUNWLE1BQU0sYUFBSyxFQUFFLENBQUE7Z0JBQ2IsS0FBSyxDQUFBO1lBQ1AsS0FBSyxTQUFTO2dCQUNaLE1BQU0sZUFBTyxFQUFFLENBQUE7Z0JBQ2YsS0FBSyxDQUFBO1lBQ1AsS0FBSyxNQUFNO2dCQUNULE1BQU0sWUFBSSxFQUFFLENBQUE7Z0JBQ1osS0FBSyxDQUFBO1lBQ1AsS0FBSyxNQUFNO2dCQUNULE1BQU0sWUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO2dCQUNuQixLQUFLLENBQUE7WUFDUCxLQUFLLE1BQU07Z0JBQ1QsTUFBTSxZQUFJLENBQUMsT0FBTyxDQUFDLENBQUE7Z0JBQ25CLEtBQUssQ0FBQTtZQUNQO2dCQUNFLE9BQU8sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLCtCQUErQixNQUFNLGtCQUFr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
\ No newline at end of file
diff --git a/dist/mod_docker/mod.classes.dockerfile.d.ts b/dist/mod_docker/mod.classes.dockerfile.d.ts
new file mode 100644
index 0000000..c936c22
--- /dev/null
+++ b/dist/mod_docker/mod.classes.dockerfile.d.ts
@@ -0,0 +1,42 @@
+///
+import { DockerRegistry } from './mod.classes.dockerregistry';
+/**
+ * class Dockerfile represents a Dockerfile on disk in npmci
+ */
+export declare class Dockerfile {
+ filePath: string;
+ repo: string;
+ version: string;
+ cleanTag: string;
+ buildTag: string;
+ containerName: string;
+ content: string;
+ baseImage: string;
+ localBaseImageDependent: boolean;
+ localBaseDockerfile: Dockerfile;
+ constructor(options: {
+ filePath?: string;
+ fileContents?: string | Buffer;
+ read?: boolean;
+ });
+ /**
+ * builds the Dockerfile
+ */
+ build(): Promise;
+ /**
+ * pushes the Dockerfile to a registry
+ */
+ push(dockerRegistryArg: DockerRegistry, versionSuffix?: string): Promise;
+ /**
+ * pulls the Dockerfile from a registry
+ */
+ pull(registryArg: DockerRegistry, versionSuffixArg?: string): Promise;
+ /**
+ * tests the Dockerfile;
+ */
+ test(): Promise;
+ /**
+ * gets the id of a Dockerfile
+ */
+ getId(): Promise;
+}
diff --git a/dist/mod_docker/mod.classes.dockerfile.js b/dist/mod_docker/mod.classes.dockerfile.js
new file mode 100644
index 0000000..193ab44
--- /dev/null
+++ b/dist/mod_docker/mod.classes.dockerfile.js
@@ -0,0 +1,96 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+ return new (P || (P = Promise))(function (resolve, reject) {
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+ function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
+ });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const plugins = require("./mod.plugins");
+const NpmciEnv = require("../npmci.env");
+const npmci_bash_1 = require("../npmci.bash");
+const paths = require("../npmci.paths");
+const helpers = require("./mod.helpers");
+/**
+ * class Dockerfile represents a Dockerfile on disk in npmci
+ */
+class Dockerfile {
+ constructor(options) {
+ this.filePath = options.filePath;
+ this.repo = NpmciEnv.repo.user + '/' + NpmciEnv.repo.repo;
+ this.version = helpers.dockerFileVersion(plugins.path.parse(options.filePath).base);
+ this.cleanTag = this.repo + ':' + this.version;
+ this.buildTag = this.cleanTag;
+ this.containerName = 'dockerfile-' + this.version;
+ if (options.filePath && options.read) {
+ this.content = plugins.smartfile.fs.toStringSync(plugins.path.resolve(options.filePath));
+ }
+ this.baseImage = helpers.dockerBaseImage(this.content);
+ this.localBaseImageDependent = false;
+ }
+ /**
+ * builds the Dockerfile
+ */
+ build() {
+ return __awaiter(this, void 0, void 0, function* () {
+ plugins.beautylog.info('now building Dockerfile for ' + this.cleanTag);
+ let buildCommand = `docker build -t ${this.buildTag} -f ${this.filePath} .`;
+ yield npmci_bash_1.bash(buildCommand);
+ NpmciEnv.dockerFilesBuilt.push(this);
+ return;
+ });
+ }
+ /**
+ * pushes the Dockerfile to a registry
+ */
+ push(dockerRegistryArg, versionSuffix = null) {
+ return __awaiter(this, void 0, void 0, function* () {
+ let pushTag = helpers.getDockerTagString(dockerRegistryArg.registryUrl, this.repo, this.version, versionSuffix);
+ yield npmci_bash_1.bash(`docker tag ${this.buildTag} ${pushTag}`);
+ yield npmci_bash_1.bash(`docker push ${pushTag}`);
+ });
+ }
+ /**
+ * pulls the Dockerfile from a registry
+ */
+ pull(registryArg, versionSuffixArg = null) {
+ return __awaiter(this, void 0, void 0, function* () {
+ let pullTag = helpers.getDockerTagString(registryArg.registryUrl, this.repo, this.version, versionSuffixArg);
+ yield npmci_bash_1.bash(`docker tag ${pullTag} ${this.buildTag}`);
+ });
+ }
+ /**
+ * tests the Dockerfile;
+ */
+ test() {
+ return __awaiter(this, void 0, void 0, function* () {
+ let testFile = plugins.path.join(paths.NpmciTestDir, 'test_' + this.version + '.sh');
+ let testFileExists = plugins.smartfile.fs.fileExistsSync(testFile);
+ if (testFileExists) {
+ // run tests
+ yield npmci_bash_1.bash('docker run --name npmci_test_container ' + this.buildTag + ' mkdir /npmci_test');
+ yield npmci_bash_1.bash('docker cp ' + testFile + ' npmci_test_container:/npmci_test/test.sh');
+ yield npmci_bash_1.bash('docker commit npmci_test_container npmci_test_image');
+ yield npmci_bash_1.bash('docker run npmci_test_image sh /npmci_test/test.sh');
+ yield npmci_bash_1.bash('docker rm npmci_test_container');
+ yield npmci_bash_1.bash('docker rmi --force npmci_test_image');
+ }
+ else {
+ plugins.beautylog.warn('skipping tests for ' + this.cleanTag + ' because no testfile was found!');
+ }
+ });
+ }
+ /**
+ * gets the id of a Dockerfile
+ */
+ getId() {
+ return __awaiter(this, void 0, void 0, function* () {
+ let containerId = yield npmci_bash_1.bash('docker inspect --type=image --format=\"{{.Id}}\" ' + this.buildTag);
+ return containerId;
+ });
+ }
+}
+exports.Dockerfile = Dockerfile;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kLmNsYXNzZXMuZG9ja2VyZmlsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL21vZF9kb2NrZXIvbW9kLmNsYXNzZXMuZG9ja2VyZmlsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEseUNBQXdDO0FBQ3hDLHlDQUF3QztBQUN4Qyw4Q0FBb0M7QUFDcEMsd0NBQXVDO0FBR3ZDLHlDQUF3QztBQUV4Qzs7R0FFRztBQUNIO0lBV0UsWUFBYSxPQUE4RTtRQUN6RixJQUFJLENBQUMsUUFBUSxHQUFHLE9BQU8sQ0FBQyxRQUFRLENBQUE7UUFDaEMsSUFBSSxDQUFDLElBQUksR0FBRyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksR0FBRyxHQUFHLEdBQUcsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUE7UUFDekQsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUMsaUJBQWlCLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFBO1FBQ25GLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxDQUFDLElBQUksR0FBRyxHQUFHLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQTtRQUM5QyxJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUE7UUFFN0IsSUFBSSxDQUFDLGFBQWEsR0FBRyxhQUFhLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQTtRQUNqRCxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsUUFBUSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO1lBQ3JDLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFBO1FBQzFGLENBQUM7UUFDRCxJQUFJLENBQUMsU0FBUyxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBQ3RELElBQUksQ0FBQyx1QkFBdUIsR0FBRyxLQUFLLENBQUE7SUFDdEMsQ0FBQztJQUVEOztPQUVHO0lBQ0csS0FBSzs7WUFDVCxPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyw4QkFBOEIsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUE7WUFDdEUsSUFBSSxZQUFZLEdBQUcsbUJBQW1CLElBQUksQ0FBQyxRQUFRLE9BQU8sSUFBSSxDQUFDLFFBQVEsSUFBSSxDQUFBO1lBQzNFLE1BQU0saUJBQUksQ0FBQyxZQUFZLENBQUMsQ0FBQTtZQUN4QixRQUFRLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFBO1lBQ3BDLE1BQU0sQ0FBQTtRQUNSLENBQUM7S0FBQTtJQUVEOztPQUVHO0lBQ0csSUFBSSxDQUFFLGlCQUFpQyxFQUFFLGdCQUF3QixJQUFJOztZQUN6RSxJQUFJLE9BQU8sR0FBRyxPQUFPLENBQUMsa0JBQWtCLENBQUMsaUJBQWlCLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLE9BQU8sRUFBRSxhQUFhLENBQUMsQ0FBQTtZQUMvRyxNQUFNLGlCQUFJLENBQUMsY0FBYyxJQUFJLENBQUMsUUFBUSxJQUFJLE9BQU8sRUFBRSxDQUFDLENBQUE7WUFDcEQsTUFBTSxpQkFBSSxDQUFDLGVBQWUsT0FBTyxFQUFFLENBQUMsQ0FBQTtRQUN0QyxDQUFDO0tBQUE7SUFFRDs7T0FFRztJQUNHLElBQUksQ0FBRSxXQUEyQixFQUFFLG1CQUEyQixJQUFJOztZQUN0RSxJQUFJLE9BQU8sR0FBRyxPQUFPLENBQUMsa0JBQWtCLENBQUMsV0FBVyxDQUFDLFdBQVcsRUFBQyxJQUFJLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxPQUFPLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQTtZQUMzRyxNQUFNLGlCQUFJLENBQUMsY0FBYyxPQUFPLElBQUksSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUE7UUFDdEQsQ0FBQztLQUFBO0lBRUQ7O09BRUc7SUFDRyxJQUFJOztZQUNSLElBQUksUUFBUSxHQUFXLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxZQUFZLEVBQUUsT0FBTyxHQUFHLElBQUksQ0FBQyxPQUFPLEdBQUcsS0FBSyxDQUFDLENBQUE7WUFDNUYsSUFBSSxjQUFjLEdBQVksT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsY0FBYyxDQUFDLFFBQVEsQ0FBQyxDQUFBO1lBQzNFLEVBQUUsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUM7Z0JBQ25CLFlBQVk7Z0JBQ1osTUFBTSxpQkFBSSxDQUFDLHlDQUF5QyxHQUFHLElBQUksQ0FBQyxRQUFRLEdBQUcsb0JBQW9CLENBQUMsQ0FBQTtnQkFDNUYsTUFBTSxpQkFBSSxDQUFDLFlBQVksR0FBRyxRQUFRLEdBQUcsMkNBQTJDLENBQUMsQ0FBQTtnQkFDakYsTUFBTSxpQkFBSSxDQUFDLHFEQUFxRCxDQUFDLENBQUE7Z0JBQ2pFLE1BQU0saUJBQUksQ0FBQyxvREFBb0QsQ0FBQyxDQUFBO2dCQUNoRSxNQUFNLGlCQUFJLENBQUMsZ0NBQWdDLENBQUMsQ0FBQTtnQkFDNUMsTUFBTSxpQkFBSSxDQUFDLHFDQUFxQyxDQUFDLENBQUE7WUFDbkQsQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNOLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLHFCQUFxQixHQUFHLElBQUksQ0FBQyxRQUFRLEdBQUcsaUNBQWlDLENBQUMsQ0FBQTtZQUNuRyxDQUFDO1FBQ0gsQ0FBQztLQUFBO0lBRUQ7O09BRUc7SUFDRyxLQUFLOztZQUNULElBQUksV0FBVyxHQUFHLE1BQU0saUJBQUksQ0FBQyxtREFBbUQsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUE7WUFDakcsTUFBTSxDQUFDLFdBQVcsQ0FBQTtRQUNwQixDQUFDO0tBQUE7Q0FDRjtBQWhGRCxnQ0FnRkMifQ==
\ No newline at end of file
diff --git a/dist/mod_docker/mod.classes.dockerregistry.d.ts b/dist/mod_docker/mod.classes.dockerregistry.d.ts
new file mode 100644
index 0000000..31218f4
--- /dev/null
+++ b/dist/mod_docker/mod.classes.dockerregistry.d.ts
@@ -0,0 +1,13 @@
+export interface IDockerRegistryConstructorOptions {
+ registryUrl: string;
+ username: string;
+ password: string;
+}
+export declare class DockerRegistry {
+ registryUrl: string;
+ username: string;
+ password: string;
+ constructor(optionsArg: IDockerRegistryConstructorOptions);
+ static fromEnvString(envString: string): DockerRegistry;
+ login(): Promise;
+}
diff --git a/dist/mod_docker/mod.classes.dockerregistry.js b/dist/mod_docker/mod.classes.dockerregistry.js
new file mode 100644
index 0000000..24cfc21
--- /dev/null
+++ b/dist/mod_docker/mod.classes.dockerregistry.js
@@ -0,0 +1,49 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+ return new (P || (P = Promise))(function (resolve, reject) {
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+ function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
+ });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const plugins = require("./mod.plugins");
+const npmci_bash_1 = require("../npmci.bash");
+class DockerRegistry {
+ constructor(optionsArg) {
+ this.registryUrl = optionsArg.registryUrl;
+ this.username = optionsArg.username;
+ this.password = optionsArg.password;
+ }
+ static fromEnvString(envString) {
+ let dockerRegexResultArray = envString.split('|');
+ if (dockerRegexResultArray.length !== 3) {
+ plugins.beautylog.error('malformed docker env var...');
+ process.exit(1);
+ return;
+ }
+ let registryUrl = dockerRegexResultArray[0];
+ let username = dockerRegexResultArray[1];
+ let password = dockerRegexResultArray[2];
+ return new DockerRegistry({
+ registryUrl: registryUrl,
+ username: username,
+ password: password
+ });
+ }
+ login() {
+ return __awaiter(this, void 0, void 0, function* () {
+ if (this.registryUrl === 'docker.io') {
+ yield npmci_bash_1.bash(`docker login -u ${this.username} -p ${this.password}`);
+ plugins.beautylog.info('Logged in to standard docker hub');
+ }
+ else {
+ yield npmci_bash_1.bash(`docker login -u ${this.username} -p ${this.password} ${this.registryUrl}`);
+ }
+ plugins.beautylog.success(`docker authenticated for ${this.registryUrl}!`);
+ });
+ }
+}
+exports.DockerRegistry = DockerRegistry;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kLmNsYXNzZXMuZG9ja2VycmVnaXN0cnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfZG9ja2VyL21vZC5jbGFzc2VzLmRvY2tlcnJlZ2lzdHJ5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSx5Q0FBd0M7QUFDeEMsOENBQW9DO0FBUXBDO0lBSUUsWUFBYSxVQUE2QztRQUN4RCxJQUFJLENBQUMsV0FBVyxHQUFHLFVBQVUsQ0FBQyxXQUFXLENBQUE7UUFDekMsSUFBSSxDQUFDLFFBQVEsR0FBRyxVQUFVLENBQUMsUUFBUSxDQUFBO1FBQ25DLElBQUksQ0FBQyxRQUFRLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQTtJQUNyQyxDQUFDO0lBRUQsTUFBTSxDQUFDLGFBQWEsQ0FBRSxTQUFpQjtRQUNyQyxJQUFJLHNCQUFzQixHQUFHLFNBQVMsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDakQsRUFBRSxDQUFDLENBQUMsc0JBQXNCLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDeEMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsNkJBQTZCLENBQUMsQ0FBQTtZQUN0RCxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO1lBQ2YsTUFBTSxDQUFBO1FBQ1IsQ0FBQztRQUNELElBQUksV0FBVyxHQUFHLHNCQUFzQixDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQzNDLElBQUksUUFBUSxHQUFHLHNCQUFzQixDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQ3hDLElBQUksUUFBUSxHQUFHLHNCQUFzQixDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQ3hDLE1BQU0sQ0FBQyxJQUFJLGNBQWMsQ0FBQztZQUN4QixXQUFXLEVBQUUsV0FBVztZQUN4QixRQUFRLEVBQUUsUUFBUTtZQUNsQixRQUFRLEVBQUUsUUFBUTtTQUNuQixDQUFDLENBQUE7SUFDSixDQUFDO0lBRUssS0FBSzs7WUFDVCxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsV0FBVyxLQUFLLFdBQVcsQ0FBQyxDQUFDLENBQUM7Z0JBQ3JDLE1BQU0saUJBQUksQ0FBQyxtQkFBbUIsSUFBSSxDQUFDLFFBQVEsT0FBTyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQTtnQkFDbEUsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsa0NBQWtDLENBQUMsQ0FBQTtZQUM1RCxDQUFDO1lBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ04sTUFBTSxpQkFBSSxDQUFDLG1CQUFtQixJQUFJLENBQUMsUUFBUSxPQUFPLElBQUksQ0FBQyxRQUFRLElBQUksSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUE7WUFDeEYsQ0FBQztZQUNELE9BQU8sQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLDRCQUE0QixJQUFJLENBQUMsV0FBVyxHQUFHLENBQUMsQ0FBQTtRQUM1RSxDQUFDO0tBQUE7Q0FDRjtBQXBDRCx3Q0FvQ0MifQ==
\ No newline at end of file
diff --git a/dist/mod_docker/mod.classes.registrystorage.d.ts b/dist/mod_docker/mod.classes.registrystorage.d.ts
new file mode 100644
index 0000000..1e8e655
--- /dev/null
+++ b/dist/mod_docker/mod.classes.registrystorage.d.ts
@@ -0,0 +1,9 @@
+import { Objectmap } from 'lik';
+import { DockerRegistry } from './mod.classes.dockerregistry';
+export declare class RegistryStorage {
+ objectMap: Objectmap;
+ constructor();
+ addRegistry(registryArg: DockerRegistry): void;
+ getRegistryByUrl(registryUrlArg: string): DockerRegistry;
+ loginAll(): Promise;
+}
diff --git a/dist/mod_docker/mod.classes.registrystorage.js b/dist/mod_docker/mod.classes.registrystorage.js
new file mode 100644
index 0000000..0647df8
--- /dev/null
+++ b/dist/mod_docker/mod.classes.registrystorage.js
@@ -0,0 +1,34 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+ return new (P || (P = Promise))(function (resolve, reject) {
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+ function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
+ });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const lik_1 = require("lik");
+class RegistryStorage {
+ constructor() {
+ this.objectMap = new lik_1.Objectmap();
+ // Nothing here
+ }
+ addRegistry(registryArg) {
+ this.objectMap.add(registryArg);
+ }
+ getRegistryByUrl(registryUrlArg) {
+ return this.objectMap.find(registryArg => {
+ return registryArg.registryUrl === registryUrlArg;
+ });
+ }
+ loginAll() {
+ return __awaiter(this, void 0, void 0, function* () {
+ yield this.objectMap.forEach((registryArg) => __awaiter(this, void 0, void 0, function* () {
+ yield registryArg.login();
+ }));
+ });
+ }
+}
+exports.RegistryStorage = RegistryStorage;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kLmNsYXNzZXMucmVnaXN0cnlzdG9yYWdlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvbW9kX2RvY2tlci9tb2QuY2xhc3Nlcy5yZWdpc3RyeXN0b3JhZ2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUNBLDZCQUErQjtBQUkvQjtJQUVFO1FBREEsY0FBUyxHQUFHLElBQUksZUFBUyxFQUFrQixDQUFBO1FBRXpDLGVBQWU7SUFDakIsQ0FBQztJQUVELFdBQVcsQ0FBRSxXQUEyQjtRQUN0QyxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsQ0FBQTtJQUNqQyxDQUFDO0lBRUQsZ0JBQWdCLENBQUUsY0FBc0I7UUFDdEMsTUFBTSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLFdBQVc7WUFDcEMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxXQUFXLEtBQUssY0FBYyxDQUFBO1FBQ25ELENBQUMsQ0FBQyxDQUFBO0lBQ0osQ0FBQztJQUVLLFFBQVE7O1lBQ1osTUFBTSxJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFNLFdBQVc7Z0JBQzVDLE1BQU0sV0FBVyxDQUFDLEtBQUssRUFBRSxDQUFBO1lBQzNCLENBQUMsQ0FBQSxDQUFDLENBQUE7UUFDSixDQUFDO0tBQUE7Q0FDRjtBQXJCRCwwQ0FxQkMifQ==
\ No newline at end of file
diff --git a/dist/mod_docker/mod.helpers.d.ts b/dist/mod_docker/mod.helpers.d.ts
new file mode 100644
index 0000000..4ba728b
--- /dev/null
+++ b/dist/mod_docker/mod.helpers.d.ts
@@ -0,0 +1,42 @@
+import { Dockerfile } from './mod.classes.dockerfile';
+/**
+ * creates instance of class Dockerfile for all Dockerfiles in cwd
+ * @returns Promise
+ */
+export declare let readDockerfiles: () => Promise;
+/**
+ * sorts Dockerfiles into a dependency chain
+ * @param sortableArrayArg an array of instances of class Dockerfile
+ * @returns Promise
+ */
+export declare let sortDockerfiles: (sortableArrayArg: Dockerfile[]) => Promise;
+/**
+ * maps local Dockerfiles dependencies to the correspoding Dockerfile class instances
+ */
+export declare let mapDockerfiles: (sortedArray: Dockerfile[]) => Promise;
+/**
+ * builds the correspoding real docker image for each Dockerfile class instance
+ */
+export declare let buildDockerfiles: (sortedArrayArg: Dockerfile[]) => Promise;
+/**
+ * tests all Dockerfiles in by calling class Dockerfile.test();
+ * @param sortedArrayArg Dockerfile[] that contains all Dockerfiles in cwd
+ */
+export declare let testDockerfiles: (sortedArrayArg: Dockerfile[]) => Promise;
+/**
+ * returns a version for a docker file
+ * @execution SYNC
+ */
+export declare let dockerFileVersion: (dockerfileNameArg: string) => string;
+/**
+ * returns the docker base image for a Dockerfile
+ */
+export declare let dockerBaseImage: (dockerfileContentArg: string) => string;
+/**
+ * returns the docker tag
+ */
+export declare let getDockerTagString: (registryArg: string, repoArg: string, versionArg: string, suffixArg?: string) => string;
+/**
+ *
+ */
+export declare let cleanTagsArrayFunction: (dockerfileArrayArg: Dockerfile[], trackingArrayArg: Dockerfile[]) => string[];
diff --git a/dist/mod_docker/mod.helpers.js b/dist/mod_docker/mod.helpers.js
new file mode 100644
index 0000000..87d0fe9
--- /dev/null
+++ b/dist/mod_docker/mod.helpers.js
@@ -0,0 +1,152 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+ return new (P || (P = Promise))(function (resolve, reject) {
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+ function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
+ });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const plugins = require("./mod.plugins");
+const paths = require("../npmci.paths");
+const mod_classes_dockerfile_1 = require("./mod.classes.dockerfile");
+/**
+ * creates instance of class Dockerfile for all Dockerfiles in cwd
+ * @returns Promise
+ */
+exports.readDockerfiles = () => __awaiter(this, void 0, void 0, function* () {
+ let fileTree = yield plugins.smartfile.fs.listFileTree(paths.cwd, 'Dockerfile*');
+ // create the Dockerfile array
+ let readDockerfilesArray = [];
+ plugins.beautylog.info(`found ${fileTree.length} Dockerfiles:`);
+ console.log(fileTree);
+ for (let dockerfilePath of fileTree) {
+ let myDockerfile = new mod_classes_dockerfile_1.Dockerfile({
+ filePath: dockerfilePath,
+ read: true
+ });
+ readDockerfilesArray.push(myDockerfile);
+ }
+ return readDockerfilesArray;
+});
+/**
+ * sorts Dockerfiles into a dependency chain
+ * @param sortableArrayArg an array of instances of class Dockerfile
+ * @returns Promise
+ */
+exports.sortDockerfiles = (sortableArrayArg) => {
+ let done = plugins.q.defer();
+ plugins.beautylog.info('sorting Dockerfiles:');
+ let sortedArray = [];
+ let cleanTagsOriginal = exports.cleanTagsArrayFunction(sortableArrayArg, sortedArray);
+ let sorterFunctionCounter = 0;
+ let sorterFunction = function () {
+ sortableArrayArg.forEach((dockerfileArg) => {
+ let cleanTags = exports.cleanTagsArrayFunction(sortableArrayArg, sortedArray);
+ if (cleanTags.indexOf(dockerfileArg.baseImage) === -1 && sortedArray.indexOf(dockerfileArg) === -1) {
+ sortedArray.push(dockerfileArg);
+ }
+ if (cleanTagsOriginal.indexOf(dockerfileArg.baseImage) !== -1) {
+ dockerfileArg.localBaseImageDependent = true;
+ }
+ });
+ if (sortableArrayArg.length === sortedArray.length) {
+ let counter = 1;
+ for (let dockerfile of sortedArray) {
+ plugins.beautylog.log(`tag ${counter}: -> ${dockerfile.cleanTag}`);
+ counter++;
+ }
+ done.resolve(sortedArray);
+ }
+ else if (sorterFunctionCounter < 10) {
+ sorterFunctionCounter++;
+ sorterFunction();
+ }
+ };
+ sorterFunction();
+ return done.promise;
+};
+/**
+ * maps local Dockerfiles dependencies to the correspoding Dockerfile class instances
+ */
+exports.mapDockerfiles = (sortedArray) => __awaiter(this, void 0, void 0, function* () {
+ sortedArray.forEach((dockerfileArg) => {
+ if (dockerfileArg.localBaseImageDependent) {
+ sortedArray.forEach((dockfile2) => {
+ if (dockfile2.cleanTag === dockerfileArg.baseImage) {
+ dockerfileArg.localBaseDockerfile = dockfile2;
+ }
+ });
+ }
+ });
+ return sortedArray;
+});
+/**
+ * builds the correspoding real docker image for each Dockerfile class instance
+ */
+exports.buildDockerfiles = (sortedArrayArg) => __awaiter(this, void 0, void 0, function* () {
+ for (let dockerfileArg of sortedArrayArg) {
+ yield dockerfileArg.build();
+ }
+ return sortedArrayArg;
+});
+/**
+ * tests all Dockerfiles in by calling class Dockerfile.test();
+ * @param sortedArrayArg Dockerfile[] that contains all Dockerfiles in cwd
+ */
+exports.testDockerfiles = (sortedArrayArg) => __awaiter(this, void 0, void 0, function* () {
+ for (let dockerfileArg of sortedArrayArg) {
+ yield dockerfileArg.test();
+ }
+ return sortedArrayArg;
+});
+/**
+ * returns a version for a docker file
+ * @execution SYNC
+ */
+exports.dockerFileVersion = (dockerfileNameArg) => {
+ let versionString;
+ let versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/;
+ let regexResultArray = versionRegex.exec(dockerfileNameArg);
+ if (regexResultArray && regexResultArray.length === 2) {
+ versionString = regexResultArray[1];
+ }
+ else {
+ versionString = 'latest';
+ }
+ return versionString;
+};
+/**
+ * returns the docker base image for a Dockerfile
+ */
+exports.dockerBaseImage = function (dockerfileContentArg) {
+ let baseImageRegex = /FROM\s([a-zA-z0-9\/\-\:]*)\n?/;
+ let regexResultArray = baseImageRegex.exec(dockerfileContentArg);
+ return regexResultArray[1];
+};
+/**
+ * returns the docker tag
+ */
+exports.getDockerTagString = function (registryArg, repoArg, versionArg, suffixArg) {
+ // determine wether the suffix is needed
+ let version = versionArg;
+ if (suffixArg) {
+ version = versionArg + '_' + suffixArg;
+ }
+ let tagString = `${registryArg}/${repoArg}:${version}`;
+ return tagString;
+};
+/**
+ *
+ */
+exports.cleanTagsArrayFunction = function (dockerfileArrayArg, trackingArrayArg) {
+ let cleanTagsArray = [];
+ dockerfileArrayArg.forEach(function (dockerfileArg) {
+ if (trackingArrayArg.indexOf(dockerfileArg) === -1) {
+ cleanTagsArray.push(dockerfileArg.cleanTag);
+ }
+ });
+ return cleanTagsArray;
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kLmhlbHBlcnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfZG9ja2VyL21vZC5oZWxwZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSx5Q0FBd0M7QUFDeEMsd0NBQXVDO0FBSXZDLHFFQUFxRDtBQUVyRDs7O0dBR0c7QUFDUSxRQUFBLGVBQWUsR0FBRztJQUMzQixJQUFJLFFBQVEsR0FBRyxNQUFNLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLGFBQWEsQ0FBQyxDQUFBO0lBRWhGLDhCQUE4QjtJQUM5QixJQUFJLG9CQUFvQixHQUFpQixFQUFFLENBQUE7SUFDM0MsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsU0FBUyxRQUFRLENBQUMsTUFBTSxlQUFlLENBQUMsQ0FBQTtJQUMvRCxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFBO0lBQ3JCLEdBQUcsQ0FBQyxDQUFDLElBQUksY0FBYyxJQUFJLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDcEMsSUFBSSxZQUFZLEdBQUcsSUFBSSxtQ0FBVSxDQUFDO1lBQ2hDLFFBQVEsRUFBRSxjQUFjO1lBQ3hCLElBQUksRUFBRSxJQUFJO1NBQ1gsQ0FBQyxDQUFBO1FBQ0Ysb0JBQW9CLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFBO0lBQ3pDLENBQUM7SUFFRCxNQUFNLENBQUMsb0JBQW9CLENBQUE7QUFFN0IsQ0FBQyxDQUFBLENBQUE7QUFFRDs7OztHQUlHO0FBQ1EsUUFBQSxlQUFlLEdBQUcsQ0FBQyxnQkFBOEI7SUFDMUQsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQWdCLENBQUE7SUFDMUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsc0JBQXNCLENBQUMsQ0FBQTtJQUM5QyxJQUFJLFdBQVcsR0FBaUIsRUFBRSxD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
\ No newline at end of file
diff --git a/package.json b/package.json
index 2267eeb..e4597ab 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
"cflare": "^1.0.5",
"gulp": "^3.9.1",
"gulp-function": "^2.2.9",
+ "lik": "^1.0.39",
"lodash": "^4.17.4",
"npmextra": "^2.0.9",
"projectinfo": "^3.0.2",
diff --git a/test/test.ts b/test/test.ts
index 602173c..2d318cd 100644
--- a/test/test.ts
+++ b/test/test.ts
@@ -33,7 +33,7 @@ tap.test('should return valid Dockerfiles', async () => {
})
tap.test('should read a directory of Dockerfiles', async () => {
- return npmciModDocker.readDockerfiles()
+ return npmciModDocker.helpers.readDockerfiles()
.then(async (readDockerfilesArrayArg: npmciModDocker.Dockerfile[]) => {
sortableArray = readDockerfilesArrayArg
return expect(readDockerfilesArrayArg[1].version).to.equal('sometag1')
@@ -41,7 +41,7 @@ tap.test('should read a directory of Dockerfiles', async () => {
})
tap.test('should sort an array of Dockerfiles', async () => {
- return npmciModDocker.sortDockerfiles(sortableArray)
+ return npmciModDocker.helpers.sortDockerfiles(sortableArray)
.then(async (sortedArrayArg: npmciModDocker.Dockerfile[]) => {
console.log(sortedArrayArg)
})
diff --git a/ts/mod_docker/index.ts b/ts/mod_docker/index.ts
index e824714..1dbfedd 100644
--- a/ts/mod_docker/index.ts
+++ b/ts/mod_docker/index.ts
@@ -3,6 +3,21 @@ import * as paths from '../npmci.paths'
import * as NpmciEnv from '../npmci.env'
import { bash } from '../npmci.bash'
+import * as helpers from './mod.helpers'
+
+// classes
+import { Dockerfile } from './mod.classes.dockerfile'
+import { DockerRegistry } from './mod.classes.dockerregistry'
+import { RegistryStorage } from './mod.classes.registrystorage'
+
+// instances
+let npmciRegistryStorage = new RegistryStorage()
+
+export {
+ Dockerfile,
+ helpers
+}
+
export let modArgvArg // will be set through the build command
/**
@@ -12,7 +27,7 @@ export let modArgvArg // will be set through the build command
export let handleCli = async (argvArg) => {
modArgvArg = argvArg
if (argvArg._.length >= 2) {
- let action: string = argvArg._[1]
+ let action: string = argvArg._[ 1 ]
switch (action) {
case 'build':
await build()
@@ -23,6 +38,12 @@ export let handleCli = async (argvArg) => {
case 'test':
await test()
break
+ case 'push':
+ await push(argvArg)
+ break
+ case 'pull':
+ await pull(argvArg)
+ break
default:
plugins.beautylog.error(`>>npmci node ...<< action >>${action}<< not supported`)
}
@@ -31,6 +52,16 @@ export let handleCli = async (argvArg) => {
}
}
+/**
+ * builds a cwd of Dockerfiles by triggering a promisechain
+ */
+export let build = async () => {
+ plugins.beautylog.log('now building Dockerfiles...')
+ await helpers.readDockerfiles()
+ .then(helpers.sortDockerfiles)
+ .then(helpers.mapDockerfiles)
+ .then(helpers.buildDockerfiles)
+}
/**
* logs in docker
@@ -38,339 +69,58 @@ export let handleCli = async (argvArg) => {
export let prepare = async () => {
NpmciEnv.setDockerRegistry('docker.io') // TODO: checkup why we set this here
- // handle registries
- plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_LOGIN_DOCKER*', async (envString) => {
- let dockerRegexResultArray = envString.split('|')
- if (dockerRegexResultArray.length !== 3) {
- plugins.beautylog.error('malformed docker env var...')
- process.exit(1)
- return
- }
- let registry = dockerRegexResultArray[0]
- let username = dockerRegexResultArray[1]
- let password = dockerRegexResultArray[2]
- if (registry === 'docker.io') {
- await bash(`docker login -u ${username} -p ${password}`)
- plugins.beautylog.info('Logged in to standard docker hub')
- } else {
- await bash(`docker login -u ${username} -p ${password} ${registry}`)
- }
- plugins.beautylog.success(`docker authenticated for ${registry}!`)
- })
-
// Always login to GitLab Registry
if (!process.env.CI_BUILD_TOKEN || process.env.CI_BUILD_TOKEN === '') {
plugins.beautylog.error('No registry token specified by gitlab!')
return
}
- await bash(`docker login -u gitlab-ci-token -p ${process.env.CI_BUILD_TOKEN} registry.gitlab.com`)
- plugins.beautylog.success(`docker authenticated for registry.gitlab.com!`)
+ npmciRegistryStorage.addRegistry(new DockerRegistry({
+ registryUrl: 'registry.gitlab.com',
+ username: 'gitlab-ci-token',
+ password: process.env.CI_BUILD_TOKEN
+ }))
+
+ // handle registries
+ plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_LOGIN_DOCKER*', async (envString) => {
+ npmciRegistryStorage.addRegistry(
+ DockerRegistry.fromEnvString(envString)
+ )
+ await npmciRegistryStorage.loginAll()
+ })
return
}
-/**
- * builds a cwd of Dockerfiles by triggering a promisechain
- */
-export let build = async () => {
- plugins.beautylog.log('now building Dockerfiles...')
- await readDockerfiles()
- .then(sortDockerfiles)
- .then(mapDockerfiles)
- .then(buildDockerfiles)
+export let push = async (argvArg) => {
+ let registryUrlArg = argvArg._[ 2 ]
+ let suffix = null
+ if (argvArg._.length >= 4) {
+ suffix = argvArg._[ 3 ]
+ }
+ let dockerfileArray = await helpers.readDockerfiles()
+ .then(helpers.sortDockerfiles)
+ .then(helpers.mapDockerfiles)
+ let localDockerRegistry = npmciRegistryStorage.getRegistryByUrl(registryUrlArg)
+ for (let dockerfile of dockerfileArray) {
+ dockerfile.push(localDockerRegistry, suffix)
+ }
}
-export let push = async () => {
- await readDockerfiles()
- .then(sortDockerfiles)
- .then(mapDockerfiles)
- .then(pushDockerfiles)
-}
-
-export let pull = async () => {
- return await readDockerfiles()
- .then(pullDockerfileImages)
+export let pull = async (argvArg) => {
+ let registryUrlArg = argvArg._[ 2 ]
+ let suffix = null
+ if (argvArg._.length >= 4) {
+ suffix = argvArg._[ 3 ]
+ }
+ let localDockerRegistry = npmciRegistryStorage.getRegistryByUrl(registryUrlArg)
+ let dockerfileArray = await helpers.readDockerfiles()
+ .then(helpers.sortDockerfiles)
+ .then(helpers.mapDockerfiles)
+ for (let dockerfile of dockerfileArray) {
+ dockerfile.pull(localDockerRegistry, suffix)
+ }
}
export let test = async () => {
- return await readDockerfiles()
- .then(testDockerfiles)
-}
-
-/**
- * creates instance of class Dockerfile for all Dockerfiles in cwd
- * @returns Promise
- */
-export let readDockerfiles = async (): Promise => {
- let fileTree = await plugins.smartfile.fs.listFileTree(paths.cwd, 'Dockerfile*')
-
- // create the Dockerfile array
- let readDockerfilesArray: Dockerfile[] = []
- plugins.beautylog.info(`found ${fileTree.length} Dockerfiles:`)
- console.log(fileTree)
- for (let dockerfilePath of fileTree) {
- let myDockerfile = new Dockerfile({
- filePath: dockerfilePath,
- read: true
- })
- readDockerfilesArray.push(myDockerfile)
- }
-
- return readDockerfilesArray
-
-}
-
-/**
- * sorts Dockerfiles into a dependency chain
- * @param sortableArrayArg an array of instances of class Dockerfile
- * @returns Promise
- */
-export let sortDockerfiles = (sortableArrayArg: Dockerfile[]): Promise => {
- let done = plugins.q.defer()
- plugins.beautylog.info('sorting Dockerfiles:')
- let sortedArray: Dockerfile[] = []
- let cleanTagsOriginal = cleanTagsArrayFunction(sortableArrayArg, sortedArray)
- let sorterFunctionCounter: number = 0
- let sorterFunction = function () {
- sortableArrayArg.forEach((dockerfileArg) => {
- let cleanTags = cleanTagsArrayFunction(sortableArrayArg, sortedArray)
- if (cleanTags.indexOf(dockerfileArg.baseImage) === -1 && sortedArray.indexOf(dockerfileArg) === -1) {
- sortedArray.push(dockerfileArg)
- }
- if (cleanTagsOriginal.indexOf(dockerfileArg.baseImage) !== -1) {
- dockerfileArg.localBaseImageDependent = true
- }
- })
- if (sortableArrayArg.length === sortedArray.length) {
- let counter = 1
- for (let dockerfile of sortedArray) {
- plugins.beautylog.log(`tag ${counter}: -> ${dockerfile.cleanTag}`)
- counter++
- }
- done.resolve(sortedArray)
- } else if (sorterFunctionCounter < 10) {
- sorterFunctionCounter++
- sorterFunction()
- }
- }
- sorterFunction()
- return done.promise
-}
-
-/**
- * maps local Dockerfiles dependencies to the correspoding Dockerfile class instances
- */
-export let mapDockerfiles = async (sortedArray: Dockerfile[]): Promise => {
- sortedArray.forEach((dockerfileArg) => {
- if (dockerfileArg.localBaseImageDependent) {
- sortedArray.forEach((dockfile2: Dockerfile) => {
- if (dockfile2.cleanTag === dockerfileArg.baseImage) {
- dockerfileArg.localBaseDockerfile = dockfile2
- }
- })
- }
- })
- return sortedArray
-}
-
-/**
- * builds the correspoding real docker image for each Dockerfile class instance
- */
-export let buildDockerfiles = async (sortedArrayArg: Dockerfile[]) => {
- for (let dockerfileArg of sortedArrayArg) {
- await dockerfileArg.build()
- }
- return sortedArrayArg
-}
-
-/**
- * pushes the real Dockerfile images to a Docker registry
- */
-export let pushDockerfiles = async (sortedArrayArg: Dockerfile[]) => {
- let stageArg = (function () {
- if (modArgvArg._ && modArgvArg._.length >= 3) {
- return modArgvArg._[ 2 ]
- } else {
- return NpmciEnv.buildStage
- }
- })()
- for (let dockerfileArg of sortedArrayArg) {
- await dockerfileArg.push(stageArg)
- }
- return sortedArrayArg
-}
-
-/**
- * pulls corresponding real Docker images for instances of Dockerfile from a registry.
- * This is needed if building, testing, and publishing of Docker images is carried out in seperate CI stages.
- */
-export let pullDockerfileImages = async (sortableArrayArg: Dockerfile[], registryArg = 'registry.gitlab.com') => {
- for (let dockerfileArg of sortableArrayArg) {
- await dockerfileArg.pull(registryArg)
- }
- return sortableArrayArg
-}
-
-/**
- * tests all Dockerfiles in by calling class Dockerfile.test();
- * @param sortedArrayArg Dockerfile[] that contains all Dockerfiles in cwd
- */
-export let testDockerfiles = async (sortedArrayArg: Dockerfile[]) => {
- for (let dockerfileArg of sortedArrayArg) {
- await dockerfileArg.test()
- }
- return sortedArrayArg
-}
-
-/**
- * class Dockerfile represents a Dockerfile on disk in npmci
- */
-export class Dockerfile {
- filePath: string
- repo: string
- version: string
- cleanTag: string
- buildTag: string
- gitlabTestTag: string
- gitlabReleaseTag: string
- releaseTag: string
- containerName: string
- content: string
- baseImage: string
- localBaseImageDependent: boolean
- localBaseDockerfile: Dockerfile
- constructor(options: { filePath?: string, fileContents?: string | Buffer, read?: boolean }) {
- this.filePath = options.filePath
- this.repo = NpmciEnv.repo.user + '/' + NpmciEnv.repo.repo
- this.version = dockerFileVersion(plugins.path.parse(options.filePath).base)
- this.cleanTag = this.repo + ':' + this.version
- this.buildTag = this.cleanTag
- this.gitlabTestTag = getDockerTagString('docker.io', this.repo, this.version, 'test') // TODO: using docker.io until gitlab is fixed
- this.gitlabReleaseTag = getDockerTagString('docker.io', this.repo, this.version) // TODO: using docker.io until gitlab is fixed
-
- // the releaseTag determines where the image gets released
- this.releaseTag = getDockerTagString('docker.io', this.repo, this.version)
-
- this.containerName = 'dockerfile-' + this.version
- if (options.filePath && options.read) {
- this.content = plugins.smartfile.fs.toStringSync(plugins.path.resolve(options.filePath))
- }
- this.baseImage = dockerBaseImage(this.content)
- this.localBaseImageDependent = false
- }
-
- /**
- * builds the Dockerfile
- */
- async build () {
- plugins.beautylog.info('now building Dockerfile for ' + this.cleanTag)
- let buildCommand = `docker build -t ${this.buildTag} -f ${this.filePath} .`
- await bash(buildCommand)
- NpmciEnv.dockerFilesBuilt.push(this)
- return
- }
-
- /**
- * pushes the Dockerfile to a registry
- */
- async push (stageArg) {
- await bash(`docker tag ${this.buildTag} ${this.releaseTag}`)
- await bash(`docker tag ${this.buildTag} ${this.gitlabReleaseTag}`)
- await bash(`docker tag ${this.buildTag} ${this.gitlabTestTag}`)
- switch (stageArg) {
- case 'release':
- await bash(`docker push ${this.gitlabReleaseTag}`)
- await bash(`docker push ${this.releaseTag}`)
- break
- case 'test':
- default:
- await bash(`docker push ${this.gitlabTestTag}`)
- break
- }
- }
-
- /**
- * pulls the Dockerfile from a registry
- */
- async pull (registryArg: string) {
- await bash(`docker pull ${this.gitlabTestTag}`)
- await bash(`docker tag ${this.gitlabTestTag} ${this.buildTag}`)
- }
-
- /**
- * tests the Dockerfile;
- */
- async test () {
- let testFile: string = plugins.path.join(paths.NpmciTestDir, 'test_' + this.version + '.sh')
- let testFileExists: boolean = plugins.smartfile.fs.fileExistsSync(testFile)
- if (testFileExists) {
- // run tests
- await bash('docker run --name npmci_test_container ' + this.buildTag + ' mkdir /npmci_test')
- await bash('docker cp ' + testFile + ' npmci_test_container:/npmci_test/test.sh')
- await bash('docker commit npmci_test_container npmci_test_image')
- await bash('docker run npmci_test_image sh /npmci_test/test.sh')
- await bash('docker rm npmci_test_container')
- await bash('docker rmi --force npmci_test_image')
- } else {
- plugins.beautylog.warn('skipping tests for ' + this.cleanTag + ' because no testfile was found!')
- }
- }
-
- /**
- * gets the id of a Dockerfile
- */
- async getId () {
- let containerId = await bash('docker inspect --type=image --format=\"{{.Id}}\" ' + this.buildTag)
- return containerId
- }
-}
-
-/**
- * returns a version for a docker file
- * @execution SYNC
- */
-export let dockerFileVersion = (dockerfileNameArg: string): string => {
- let versionString: string
- let versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/
- let regexResultArray = versionRegex.exec(dockerfileNameArg)
- if (regexResultArray && regexResultArray.length === 2) {
- versionString = regexResultArray[ 1 ]
- } else {
- versionString = 'latest'
- }
- return versionString
-}
-
-/**
- * returns the docker base image for a Dockerfile
- */
-export let dockerBaseImage = function (dockerfileContentArg: string) {
- let baseImageRegex = /FROM\s([a-zA-z0-9\/\-\:]*)\n?/
- let regexResultArray = baseImageRegex.exec(dockerfileContentArg)
- return regexResultArray[ 1 ]
-}
-
-/**
- * returns the docker tag
- */
-export let getDockerTagString = function (registryArg: string, repoArg: string, versionArg: string, suffixArg?: string): string {
- // determine wether the suffix is needed
- let version = versionArg
- if (suffixArg) {
- version = versionArg + '_' + suffixArg
- }
- let tagString = `${registryArg}/${repoArg}:${version}`
- return tagString
-}
-
-/**
- *
- */
-export let cleanTagsArrayFunction = function (dockerfileArrayArg: Dockerfile[], trackingArrayArg: Dockerfile[]): string[] {
- let cleanTagsArray: string[] = []
- dockerfileArrayArg.forEach(function (dockerfileArg) {
- if (trackingArrayArg.indexOf(dockerfileArg) === -1) {
- cleanTagsArray.push(dockerfileArg.cleanTag)
- }
- })
- return cleanTagsArray
+ return await helpers.readDockerfiles()
+ .then(helpers.testDockerfiles)
}
diff --git a/ts/mod_docker/mod.classes.dockerfile.ts b/ts/mod_docker/mod.classes.dockerfile.ts
new file mode 100644
index 0000000..dcf0d5b
--- /dev/null
+++ b/ts/mod_docker/mod.classes.dockerfile.ts
@@ -0,0 +1,92 @@
+import * as plugins from './mod.plugins'
+import * as NpmciEnv from '../npmci.env'
+import { bash } from '../npmci.bash'
+import * as paths from '../npmci.paths'
+
+import { DockerRegistry } from './mod.classes.dockerregistry'
+import * as helpers from './mod.helpers'
+
+/**
+ * class Dockerfile represents a Dockerfile on disk in npmci
+ */
+export class Dockerfile {
+ filePath: string
+ repo: string
+ version: string
+ cleanTag: string
+ buildTag: string
+ containerName: string
+ content: string
+ baseImage: string
+ localBaseImageDependent: boolean
+ localBaseDockerfile: Dockerfile
+ constructor (options: { filePath?: string, fileContents?: string | Buffer, read?: boolean }) {
+ this.filePath = options.filePath
+ this.repo = NpmciEnv.repo.user + '/' + NpmciEnv.repo.repo
+ this.version = helpers.dockerFileVersion(plugins.path.parse(options.filePath).base)
+ this.cleanTag = this.repo + ':' + this.version
+ this.buildTag = this.cleanTag
+
+ this.containerName = 'dockerfile-' + this.version
+ if (options.filePath && options.read) {
+ this.content = plugins.smartfile.fs.toStringSync(plugins.path.resolve(options.filePath))
+ }
+ this.baseImage = helpers.dockerBaseImage(this.content)
+ this.localBaseImageDependent = false
+ }
+
+ /**
+ * builds the Dockerfile
+ */
+ async build () {
+ plugins.beautylog.info('now building Dockerfile for ' + this.cleanTag)
+ let buildCommand = `docker build -t ${this.buildTag} -f ${this.filePath} .`
+ await bash(buildCommand)
+ NpmciEnv.dockerFilesBuilt.push(this)
+ return
+ }
+
+ /**
+ * pushes the Dockerfile to a registry
+ */
+ async push (dockerRegistryArg: DockerRegistry, versionSuffix: string = null) {
+ let pushTag = helpers.getDockerTagString(dockerRegistryArg.registryUrl, this.repo, this.version, versionSuffix)
+ await bash(`docker tag ${this.buildTag} ${pushTag}`)
+ await bash(`docker push ${pushTag}`)
+ }
+
+ /**
+ * pulls the Dockerfile from a registry
+ */
+ async pull (registryArg: DockerRegistry, versionSuffixArg: string = null) {
+ let pullTag = helpers.getDockerTagString(registryArg.registryUrl,this.repo, this.version, versionSuffixArg)
+ await bash(`docker tag ${pullTag} ${this.buildTag}`)
+ }
+
+ /**
+ * tests the Dockerfile;
+ */
+ async test () {
+ let testFile: string = plugins.path.join(paths.NpmciTestDir, 'test_' + this.version + '.sh')
+ let testFileExists: boolean = plugins.smartfile.fs.fileExistsSync(testFile)
+ if (testFileExists) {
+ // run tests
+ await bash('docker run --name npmci_test_container ' + this.buildTag + ' mkdir /npmci_test')
+ await bash('docker cp ' + testFile + ' npmci_test_container:/npmci_test/test.sh')
+ await bash('docker commit npmci_test_container npmci_test_image')
+ await bash('docker run npmci_test_image sh /npmci_test/test.sh')
+ await bash('docker rm npmci_test_container')
+ await bash('docker rmi --force npmci_test_image')
+ } else {
+ plugins.beautylog.warn('skipping tests for ' + this.cleanTag + ' because no testfile was found!')
+ }
+ }
+
+ /**
+ * gets the id of a Dockerfile
+ */
+ async getId () {
+ let containerId = await bash('docker inspect --type=image --format=\"{{.Id}}\" ' + this.buildTag)
+ return containerId
+ }
+}
diff --git a/ts/mod_docker/mod.classes.dockerregistry.ts b/ts/mod_docker/mod.classes.dockerregistry.ts
new file mode 100644
index 0000000..e55be99
--- /dev/null
+++ b/ts/mod_docker/mod.classes.dockerregistry.ts
@@ -0,0 +1,46 @@
+import * as plugins from './mod.plugins'
+import { bash } from '../npmci.bash'
+
+export interface IDockerRegistryConstructorOptions {
+ registryUrl: string,
+ username: string,
+ password: string
+}
+
+export class DockerRegistry {
+ registryUrl: string
+ username: string
+ password: string
+ constructor (optionsArg: IDockerRegistryConstructorOptions) {
+ this.registryUrl = optionsArg.registryUrl
+ this.username = optionsArg.username
+ this.password = optionsArg.password
+ }
+
+ static fromEnvString (envString: string): DockerRegistry {
+ let dockerRegexResultArray = envString.split('|')
+ if (dockerRegexResultArray.length !== 3) {
+ plugins.beautylog.error('malformed docker env var...')
+ process.exit(1)
+ return
+ }
+ let registryUrl = dockerRegexResultArray[0]
+ let username = dockerRegexResultArray[1]
+ let password = dockerRegexResultArray[2]
+ return new DockerRegistry({
+ registryUrl: registryUrl,
+ username: username,
+ password: password
+ })
+ }
+
+ async login () {
+ if (this.registryUrl === 'docker.io') {
+ await bash(`docker login -u ${this.username} -p ${this.password}`)
+ plugins.beautylog.info('Logged in to standard docker hub')
+ } else {
+ await bash(`docker login -u ${this.username} -p ${this.password} ${this.registryUrl}`)
+ }
+ plugins.beautylog.success(`docker authenticated for ${this.registryUrl}!`)
+ }
+}
diff --git a/ts/mod_docker/mod.classes.registrystorage.ts b/ts/mod_docker/mod.classes.registrystorage.ts
new file mode 100644
index 0000000..4badb01
--- /dev/null
+++ b/ts/mod_docker/mod.classes.registrystorage.ts
@@ -0,0 +1,27 @@
+import * as plugins from './mod.plugins'
+import { Objectmap } from 'lik'
+
+import { DockerRegistry } from './mod.classes.dockerregistry'
+
+export class RegistryStorage {
+ objectMap = new Objectmap()
+ constructor () {
+ // Nothing here
+ }
+
+ addRegistry (registryArg: DockerRegistry) {
+ this.objectMap.add(registryArg)
+ }
+
+ getRegistryByUrl (registryUrlArg: string) {
+ return this.objectMap.find(registryArg => {
+ return registryArg.registryUrl === registryUrlArg
+ })
+ }
+
+ async loginAll () {
+ await this.objectMap.forEach(async registryArg => {
+ await registryArg.login()
+ })
+ }
+}
diff --git a/ts/mod_docker/mod.helpers.ts b/ts/mod_docker/mod.helpers.ts
new file mode 100644
index 0000000..5c3fd65
--- /dev/null
+++ b/ts/mod_docker/mod.helpers.ts
@@ -0,0 +1,154 @@
+import * as plugins from './mod.plugins'
+import * as paths from '../npmci.paths'
+import * as NpmciEnv from '../npmci.env'
+import { bash } from '../npmci.bash'
+
+import { Dockerfile } from './mod.classes.dockerfile'
+
+/**
+ * creates instance of class Dockerfile for all Dockerfiles in cwd
+ * @returns Promise
+ */
+export let readDockerfiles = async (): Promise => {
+ let fileTree = await plugins.smartfile.fs.listFileTree(paths.cwd, 'Dockerfile*')
+
+ // create the Dockerfile array
+ let readDockerfilesArray: Dockerfile[] = []
+ plugins.beautylog.info(`found ${fileTree.length} Dockerfiles:`)
+ console.log(fileTree)
+ for (let dockerfilePath of fileTree) {
+ let myDockerfile = new Dockerfile({
+ filePath: dockerfilePath,
+ read: true
+ })
+ readDockerfilesArray.push(myDockerfile)
+ }
+
+ return readDockerfilesArray
+
+}
+
+/**
+ * sorts Dockerfiles into a dependency chain
+ * @param sortableArrayArg an array of instances of class Dockerfile
+ * @returns Promise
+ */
+export let sortDockerfiles = (sortableArrayArg: Dockerfile[]): Promise => {
+ let done = plugins.q.defer()
+ plugins.beautylog.info('sorting Dockerfiles:')
+ let sortedArray: Dockerfile[] = []
+ let cleanTagsOriginal = cleanTagsArrayFunction(sortableArrayArg, sortedArray)
+ let sorterFunctionCounter: number = 0
+ let sorterFunction = function () {
+ sortableArrayArg.forEach((dockerfileArg) => {
+ let cleanTags = cleanTagsArrayFunction(sortableArrayArg, sortedArray)
+ if (cleanTags.indexOf(dockerfileArg.baseImage) === -1 && sortedArray.indexOf(dockerfileArg) === -1) {
+ sortedArray.push(dockerfileArg)
+ }
+ if (cleanTagsOriginal.indexOf(dockerfileArg.baseImage) !== -1) {
+ dockerfileArg.localBaseImageDependent = true
+ }
+ })
+ if (sortableArrayArg.length === sortedArray.length) {
+ let counter = 1
+ for (let dockerfile of sortedArray) {
+ plugins.beautylog.log(`tag ${counter}: -> ${dockerfile.cleanTag}`)
+ counter++
+ }
+ done.resolve(sortedArray)
+ } else if (sorterFunctionCounter < 10) {
+ sorterFunctionCounter++
+ sorterFunction()
+ }
+ }
+ sorterFunction()
+ return done.promise
+}
+
+/**
+ * maps local Dockerfiles dependencies to the correspoding Dockerfile class instances
+ */
+export let mapDockerfiles = async (sortedArray: Dockerfile[]): Promise => {
+ sortedArray.forEach((dockerfileArg) => {
+ if (dockerfileArg.localBaseImageDependent) {
+ sortedArray.forEach((dockfile2: Dockerfile) => {
+ if (dockfile2.cleanTag === dockerfileArg.baseImage) {
+ dockerfileArg.localBaseDockerfile = dockfile2
+ }
+ })
+ }
+ })
+ return sortedArray
+}
+
+/**
+ * builds the correspoding real docker image for each Dockerfile class instance
+ */
+export let buildDockerfiles = async (sortedArrayArg: Dockerfile[]) => {
+ for (let dockerfileArg of sortedArrayArg) {
+ await dockerfileArg.build()
+ }
+ return sortedArrayArg
+}
+
+/**
+ * tests all Dockerfiles in by calling class Dockerfile.test();
+ * @param sortedArrayArg Dockerfile[] that contains all Dockerfiles in cwd
+ */
+export let testDockerfiles = async (sortedArrayArg: Dockerfile[]) => {
+ for (let dockerfileArg of sortedArrayArg) {
+ await dockerfileArg.test()
+ }
+ return sortedArrayArg
+}
+
+/**
+ * returns a version for a docker file
+ * @execution SYNC
+ */
+export let dockerFileVersion = (dockerfileNameArg: string): string => {
+ let versionString: string
+ let versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/
+ let regexResultArray = versionRegex.exec(dockerfileNameArg)
+ if (regexResultArray && regexResultArray.length === 2) {
+ versionString = regexResultArray[ 1 ]
+ } else {
+ versionString = 'latest'
+ }
+ return versionString
+}
+
+/**
+ * returns the docker base image for a Dockerfile
+ */
+export let dockerBaseImage = function (dockerfileContentArg: string) {
+ let baseImageRegex = /FROM\s([a-zA-z0-9\/\-\:]*)\n?/
+ let regexResultArray = baseImageRegex.exec(dockerfileContentArg)
+ return regexResultArray[ 1 ]
+}
+
+/**
+ * returns the docker tag
+ */
+export let getDockerTagString = function (registryArg: string, repoArg: string, versionArg: string, suffixArg?: string): string {
+ // determine wether the suffix is needed
+ let version = versionArg
+ if (suffixArg) {
+ version = versionArg + '_' + suffixArg
+ }
+ let tagString = `${registryArg}/${repoArg}:${version}`
+ return tagString
+}
+
+/**
+ *
+ */
+export let cleanTagsArrayFunction = function (dockerfileArrayArg: Dockerfile[], trackingArrayArg: Dockerfile[]): string[] {
+ let cleanTagsArray: string[] = []
+ dockerfileArrayArg.forEach(function (dockerfileArg) {
+ if (trackingArrayArg.indexOf(dockerfileArg) === -1) {
+ cleanTagsArray.push(dockerfileArg.cleanTag)
+ }
+ })
+ return cleanTagsArray
+}
diff --git a/yarn.lock b/yarn.lock
index d1b2b50..9d84a9a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1501,9 +1501,9 @@ liftoff@^2.1.0:
rechoir "^0.6.2"
resolve "^1.1.7"
-lik@^1.0.30, lik@^1.0.38:
- version "1.0.38"
- resolved "https://registry.yarnpkg.com/lik/-/lik-1.0.38.tgz#ccff0abd3d9236a5e4b7d80d514c5c210f18469b"
+lik@^1.0.30, lik@^1.0.38, lik@^1.0.39:
+ version "1.0.39"
+ resolved "https://registry.yarnpkg.com/lik/-/lik-1.0.39.tgz#20eeaa93167a19f03ba2c9650939145326051ee6"
dependencies:
"@types/lodash" "^4.14.67"
"@types/minimatch" "2.x.x"