Skip to content
This repository has been archived by the owner on Dec 4, 2018. It is now read-only.

Add support for docker #260

Merged
merged 1 commit into from Apr 10, 2015
Merged

Add support for docker #260

merged 1 commit into from Apr 10, 2015

Conversation

vuntz
Copy link
Member

@vuntz vuntz commented Mar 12, 2015

No description provided.

@vuntz vuntz changed the title Add suppor for docker Add support for docker Mar 12, 2015
@@ -81,6 +81,7 @@ workers = <%= [node["cpu"]["total"], 2, 4].sort[1] %>

# Supported values for the 'container_format' image attribute
#container_formats=ami,ari,aki,bare,ovf,ova
container_formats=ami,ari,aki,bare,ovf,ova<%= @use_docker ? ",docker" : "" %>
Copy link
Contributor

Choose a reason for hiding this comment

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

I think it should be nicer to have it as an attribute array and join it within the config, what do you think?

Copy link
Member Author

Choose a reason for hiding this comment

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

For the record, the reason to not use an attribute array is that we want to easily be able to compare the values we don't change (ami,ari,aki,bare,ovf,ova) with what is in the upstream config file.

@tboerger
Copy link
Contributor

Small nitpic but LGTM

@jsuchome
Copy link
Member

jsuchome commented Apr 2, 2015

+1, tested and adding docker image to glance works

vuntz added a commit that referenced this pull request Apr 10, 2015
@vuntz vuntz merged commit 056958b into crowbar:master Apr 10, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
3 participants