Skip to content
This repository has been archived by the owner on Feb 24, 2020. It is now read-only.

godeps: bump docker2aci #1826

Merged
merged 1 commit into from
Dec 3, 2015
Merged
Changes from all commits
Commits
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
godeps: bump docker2aci
docker2aci recently gained support for the v2 docker HTTP API. Bumping
the version used by rkt to pull that into here.
Derek Gonyeo committed Dec 2, 2015
commit b57536f399150488121639df7d0458da5668e57e
4 changes: 2 additions & 2 deletions Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rkt/images.go
Original file line number Diff line number Diff line change
@@ -444,7 +444,7 @@ func (f *fetcher) fetch(appName string, aciURL, ascURL string, ascFile *os.File,
user = creds.User
password = creds.Password
}
acis, err := docker2aci.Convert(registryURL, true, tmpDir, tmpDir, user, password)
acis, err := docker2aci.Convert(registryURL, true, tmpDir, tmpDir, user, password, globalFlags.InsecureFlags.SkipTlsCheck())
if err != nil {
return nil, nil, nil, fmt.Errorf("error converting docker image to ACI: %v", err)
}