Skip to content
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

Jump to bottom

(docs) Update Tooltip: Bake Configuration -> Base AMI #4161

Merged
merged 6 commits into from
Sep 28, 2017
Merged

(docs) Update Tooltip: Bake Configuration -> Base AMI #4161

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
670fa67
updated the not very helpful message in tooltip
Sep 27, 2017
614ebc0
updated the tooltip
Sep 27, 2017
a748d86
Merge branch 'master' into tooltip-help-base-ami
ankitml Sep 27, 2017
dd7b74c
Merge branch 'master' into tooltip-help-base-ami
ankitml Sep 27, 2017
5959364
Merge branch 'master' into tooltip-help-base-ami
ankitml Sep 28, 2017
ddefcf8
Merge branch 'master' into tooltip-help-base-ami
anotherchrisberry Sep 28, 2017
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
2 changes: 1 addition & 1 deletion app/scripts/modules/core/src/help/help.contents.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ module(HELP_CONTENTS, [])
'pipeline.config.docker.bake.targetImage': '<p>The name of the resulting docker image.</p>',
'pipeline.config.docker.bake.targetImageTag': '<p>The tag of the resulting docker image, defaults to commit hash if available.</p>',
'pipeline.config.docker.bake.organization': '<p>The name of the organization or repo to use for the resulting docker image.</p>',
'pipeline.config.bake.baseAmi': '<p>(Optional) ami-????????</p>',
'pipeline.config.bake.baseAmi': '<p>(Optional) If Base AMI is specified, this will be used instead of the Base OS provided',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this say "Base image" instead of "Base OS"?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Third field for 'Bake Configuration' form says 'Base OS'. So if we specify this field 'base AMI', bake step ignores what we have provided in 'Base OS field'. That has been my understanding till now and conveying this in the tooltip

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, right, makes sense.

'pipeline.config.bake.amiSuffix': '<p>(Optional) String of date in format YYYYMMDDHHmm, default is calculated from timestamp,</p>',
'pipeline.config.bake.amiName': '<p>(Optional) Default = $package-$arch-$ami_suffix-$store_type</p>',
'pipeline.config.bake.templateFileName': '<p>(Optional) The explicit packer template to use, instead of resolving one from rosco\'s configuration.</p>',
Expand Down