rkt · krnowak · Feb 19, 2016 · Feb 19, 2016 · Feb 19, 2016
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 #### Bug fixes
 - Socket activation was not working if the port on the host is different from the app port as set in the image manifest ([#2137](https://github.com/coreos/rkt/pull/2137)).
+- Fix a bug when fetching images from private repositories in the official Docker registry ([#2197](https://github.com/coreos/rkt/pull/2197)).
 
 ## v1.0.0
 

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/backend/file/file.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/backend/file/file.go
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/backend/repository/repository.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/backend/repository/repository.go
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/common/common.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/common/common.go
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/common/docker_functions.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/common/docker_functions.go
diff --git a/rkt/image/dockerfetcher.go b/rkt/image/dockerfetcher.go
@@ -50,7 +50,10 @@ type dockerFetcher struct {
 // ACI, then stores it in the store and returns the hash.
 func (f *dockerFetcher) GetHash(u *url.URL) (string, error) {
 	ensureLogger(f.Debug)
-	dockerURL := d2acommon.ParseDockerURL(path.Join(u.Host, u.Path))
+	dockerURL, err := d2acommon.ParseDockerURL(path.Join(u.Host, u.Path))
+	if err != nil {
+		return "", fmt.Errorf(`invalid docker URL %q; expected syntax is "docker://[REGISTRY_HOST[:REGISTRY_PORT]/]IMAGE_NAME[:TAG]"`, u)
+	}
 	latest := dockerURL.Tag == "latest"
 	return f.fetchImageFrom(u, latest)
 }