Merge pull request #79 from monstermunchkin/fixes/architecture_mapped

definition: Fix default name and definition template
This commit is contained in:
Stéphane Graber 2018-03-27 12:21:41 -04:00 committed by GitHub
commit dd55887e65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -167,11 +167,11 @@ func (d *Definition) SetDefaults() {
// Set default name and description templates
if d.Image.Name == "" {
d.Image.Name = "{{ image.distribution }}-{{ image.release }}-{{ image.mapped_architecture }}-{{ image.variant }}-{{ image.serial }}"
d.Image.Name = "{{ image.distribution }}-{{ image.release }}-{{ image.architecture_mapped }}-{{ image.variant }}-{{ image.serial }}"
}
if d.Image.Description == "" {
d.Image.Description = "{{ image.distribution|capfirst }} {{ image.release }} {{ image.mapped_architecture }}{% if image.variant != \"default\" %} ({{ image.variant }}){% endif %} ({{ image.serial }})"
d.Image.Description = "{{ image.distribution|capfirst }} {{ image.release }} {{ image.architecture_mapped }}{% if image.variant != \"default\" %} ({{ image.variant }}){% endif %} ({{ image.serial }})"
}
}