Skip to content

support compose on runner init on quay #636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 25, 2021
Merged

support compose on runner init on quay #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ed8b82d
support compose on runner init on quay
oren-codefresh Feb 25, 2021
be59d0a
Merge branch 'master' into CR-3493
oren-codefresh Feb 25, 2021
1a36887
Revert "support compose on runner init on quay"
oren-codefresh Feb 25, 2021
029f13b
wip
oren-codefresh Feb 25, 2021
d5b9901
Merge branch 'CR-3493' of github.com:codefresh-io/cli into CR-3493
oren-codefresh Feb 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions lib/interface/cli/commands/hybrid/init.cmd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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)',
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "codefresh",
"version": "0.75.6",
"version": "0.75.7",
"description": "Codefresh command line utility",
"main": "index.js",
"preferGlobal": true,
Expand Down