Skip to content

Order category #163

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 7 commits into from
Mar 1, 2018
Merged

Order category #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
94d5190
fix
ziv-codefresh Feb 27, 2018
b6d2684
update
ziv-codefresh Feb 27, 2018
252d216
up
ziv-codefresh Feb 28, 2018
7ace524
up
ziv-codefresh Feb 28, 2018
83c31f2
fix order
ziv-codefresh Feb 28, 2018
cd3c67e
Merge branch 'master' of github.com:codefresh-io/codefresh into order…
ziv-codefresh Mar 1, 2018
770b0a5
fix bugs
ziv-codefresh Mar 1, 2018
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
4 changes: 2 additions & 2 deletions lib/interface/cli/commands/trigger/get.cmd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ const command = new Command({
},
builder: (yargs) => {
yargs
.optional('pipeline', {
.option('pipeline', {
describe: 'pipeline id',
})
.optional('event-uri', {
.option('event-uri', {
describe: 'event URI',
});
},
Expand Down
2 changes: 1 addition & 1 deletion lib/interface/cli/commands/trigger/link.cmd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const command = new Command({
const eventURI = argv['event-uri'];
/* eslint-enable prefer-destructuring */
await trigger.createTrigger(eventURI, pipeline);
console.log(`Trigger: ${eventURI} was successfully linked to the pipeline(s): ${pipeline}`);
console.log(`Trigger: ${eventURI} was successfully linked to the pipeline: ${pipeline}`);
},
});

Expand Down
4 changes: 2 additions & 2 deletions lib/logic/api/image.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ const annotateImage = async (dockerImageId, annotations) => {
};

const addImageTag = async (options) => {
const image = await getImageById({ imageId: options.imageId });
const image = await getImageById({ id: options.imageId });
const imageId = image[0].info._id;
const RequestOptions = {
url: `/api/images/${encodeURIComponent(imageId)}/tag/${options.tag}`,
Expand All @@ -149,7 +149,7 @@ const addImageTag = async (options) => {
};

const untagImage = async (options) => {
const images = await getImageById({ imageId: options.imageId });
const images = await getImageById({ id: options.imageId });
const imageId = images[0].info._id;
const image = _.find(images, currimage => _.isEqual(currimage.info.tag, options.tag));
if (image) {
Expand Down