Skip to content
This repository has been archived by the owner. 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 commented Mar 12, 2015

No description provided.

@vuntz vuntz force-pushed the vuntz:docker branch from 3f056ab to 69d904a Mar 12, 2015
@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" : "" %>

This comment has been minimized.

@tboerger

tboerger Mar 16, 2015 Contributor

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

This comment has been minimized.

@vuntz

vuntz Apr 3, 2015 Author Member

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

tboerger commented Mar 16, 2015

Small nitpic but LGTM

@jsuchome
Copy link
Contributor

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
Add support for docker
@vuntz vuntz merged commit 056958b into crowbar:master Apr 10, 2015
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.