FEATURE: Add the strip option which allows to removes certain parts o…

…f the generated docker tags

README.md

@@ -23,6 +23,7 @@ npm i -D @immowelt/docker-publish
     --arg    <string>             The build-arg key to use when forwarding the current iterated tag.
     --image  <string>             The image name for the docker images to create.
     --latest <string>             An optional 'latest' tag to specify, defaults to 'latest'
+    --strip  <string>             An optional string which will be removed from the docker tags to generate. E.g. useful if your repo is named 'foo/java-alpine' and you don't want to repeat the '-alpine' keyword in tags.
 ```
 
 #### Example usage

src/commands/default.js

@@ -1,14 +1,27 @@
 // @flow
 
 type ExecFn = (arg: string, isLogging?: boolean) => Promise<void>;
+type Opts = {
+	tags: Array<string>,
+	image: string,
+	arg: string,
+	latest?: string,
+	strip?: string
+};
+type BuildOpts = {
+	image: string,
+	arg: string,
+	version: string,
+	tag?: string
+};
 
 const logger = require('log-fancy')('@immowelt/docker-publish');
 const fetch = require('node-fetch').default;
 const isUrl = require('is-url');
 const semver = require('semver');
 const asyncExec = require('async-exec');
 
-async function buildAndPush(opts: {image: string, arg: string, version: string, tag?: string}) {
+async function buildAndPush(opts: BuildOpts) {
 	const exec: ExecFn = asyncExec.default;
 	const {
 		image,
@@ -35,9 +48,10 @@ async function buildAndPush(opts: {image: string, arg: string, version: string,
 	logger.success(`Successfuly pushed ${dockerImageTag}!`);
 }
 
-module.exports = async (opts: {tags: Array<string>, image: string, arg: string, latest?: string}) => {
+module.exports = async (opts: Opts) => {
 	const {
 		latest = 'latest',
+		strip = false,
 		tags,
 		image,
 		arg
@@ -69,11 +83,13 @@ module.exports = async (opts: {tags: Array<string>, image: string, arg: string,
 	//
 	for (var i = 0; i < versionTags.length; i++) {
 		const version = versionTags[i];
+		const tag = strip && strip.length ? version.replace(strip, '') : version;
 
 		await buildAndPush({ // eslint-disable-line no-await-in-loop
 			image,
 			arg,
-			version
+			version,
+			tag
 		});
 	}
 

src/commands/default.spec.js

@@ -94,4 +94,21 @@ describe('defaultFlow()', () => {
 		expect(exec.args[1][0]).toContain('docker push');
 		expect(exec.args[1][0]).toContain('foo/bar:latest');
 	});
+
+	it('should allow the stripping of parts from the version tags.', async () => {
+		await defaultFlow({
+			tags: ['2.2.1-alpine', '3.0.0-alpine'],
+			image: 'foo/bar',
+			strip: '-alpine',
+			arg: 'BAR_VERSION'
+		});
+
+		expect(exec.args[0][0]).toContain('-t foo/bar:2.2.1');
+		expect(exec.args[0][0]).toContain('--build-arg BAR_VERSION=2.2.1-alpine');
+		expect(exec.args[1][0]).toContain('foo/bar:2.2.1');
+
+		expect(exec.args[2][0]).toContain('-t foo/bar:3.0.0');
+		expect(exec.args[2][0]).toContain('--build-arg BAR_VERSION=3.0.0-alpine');
+		expect(exec.args[3][0]).toContain('foo/bar:3.0.0');
+	});
 });

src/index.js

@@ -10,6 +10,7 @@ cli
 	.option('--image <string>', 'The docker image name to use as a base.')
 	.option('--arg <string>', 'The build-arg key which will be used to.')
 	.option('--latest <string>', 'The tag/version to pass into the docker build when building your latest image, defaults to "latest".')
+	.option('--strip <string>', 'An optional string to strip from the generated/fetched docker tags.')
 	.description('Uses/Fetches the given tags, filters out release only tags based on semver and builds/pushes the docker images.')
 	.version(pkg.version)
 	.parse(process.argv);
@@ -20,13 +21,14 @@ if (!cli.rawArgs.length) {
 }
 
 (async function () {
-	const {tags, image, arg, latest} = cli;
+	const {tags, image, arg, latest, strip} = cli;
 
 	try {
 		await defaultFlow({
 			latest,
 			tags,
 			image,
+			strip,
 			arg
 		});
 	} catch (err) {