From 66c6aae0ed95965c5b9acbebc89b6952823a50f2 Mon Sep 17 00:00:00 2001 From: oren-codefresh Date: Thu, 25 Feb 2021 14:39:18 +0200 Subject: [PATCH] support compose on runner init on quay (#636) * support compose on runner init on quay * Revert "support compose on runner init on quay" This reverts commit ed8b82d3195c4f0e4fadb58dc195906435b74d1a. * wip --- lib/interface/cli/commands/hybrid/init.cmd.js | 7 ++++--- package.json | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/interface/cli/commands/hybrid/init.cmd.js b/lib/interface/cli/commands/hybrid/init.cmd.js index 62cb33b95..eaedef4c2 100644 --- a/lib/interface/cli/commands/hybrid/init.cmd.js +++ b/lib/interface/cli/commands/hybrid/init.cmd.js @@ -38,6 +38,7 @@ const { const InstallationPlan = require('./InstallationPlan'); const { array } = require('yargs'); +const defaultDockerRegistry = 'quay.io'; const handleError = createErrorHandler(`\nIf you had any issues with the installation please report them at: ${colors.blue('https://github.com/codefresh-io/cli/issues/new')}`); async function isNewAccount() { @@ -148,9 +149,9 @@ const initCmd = new Command({ describe: 'Set a name of your custom storage class', }) .option('docker-registry', { - describe: 'The prefix for the container registry that will be used for pulling the required components images. Example: --docker-registry="docker.io" default is quay.io', + describe: `The prefix for the container registry that will be used for pulling the required components images. Example: --docker-registry="docker.io" default is ${defaultDockerRegistry}`, type: 'string', - default: 'quay.io', + default: defaultDockerRegistry, }) .option('kube-config-path', { describe: 'Path to kubeconfig file (default is $HOME/.kube/config)', @@ -580,7 +581,7 @@ const initCmd = new Command({ await sdk.runtimeEnvs.update({ name: reName }, _.merge(re, body)); console.log(`Runtime environment "${colors.cyan(reName)}" has been updated with the specified docker-registry images`); }, - condition: !!dockerRegistry, + condition: !!dockerRegistry && dockerRegistry !== defaultDockerRegistry, }); // update env vars diff --git a/package.json b/package.json index b39095e5a..8bb1a08a7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "codefresh", - "version": "0.75.6", + "version": "0.75.7", "description": "Codefresh command line utility", "main": "index.js", "preferGlobal": true,