From 618d197b66fd5077e37a0c909f73969a7d9273ef Mon Sep 17 00:00:00 2001 From: Kyle Vigen Date: Tue, 22 Jul 2014 14:51:37 -0700 Subject: [PATCH] Tweak command to install docker per upstream comments --- pkg/plugin/publish/docker.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkg/plugin/publish/docker.go b/pkg/plugin/publish/docker.go index 0dfce614..573d09b7 100644 --- a/pkg/plugin/publish/docker.go +++ b/pkg/plugin/publish/docker.go @@ -43,14 +43,17 @@ func (d *Docker) Write(f *buildfile.Buildfile, r *repo.Repo) { } // Install Docker on the container - f.WriteCmd("sudo sh -c \"echo deb http://get.docker.io/ubuntu docker main\\ > " + + f.WriteCmd("sudo sh -c \"echo deb https://get.docker.io/ubuntu docker main\\ > " + "/etc/apt/sources.list.d/docker.list\"") + f.WriteCmd("apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys " + + "36A1D7869245C8950F966E92D8576A8BA88D21E9") f.WriteCmd("sudo apt-get update") f.WriteCmd("sudo apt-get --yes install lxc-docker-" + d.DockerVersion) dockerServerUrl := d.Server + ":" + strconv.Itoa(d.Port) splitRepoName := strings.Split(r.Name, "/") - dockerRepo := d.RepoBaseName + "/" + splitRepoName[len(splitRepoName) - 1] + dockerRepo := d.RepoBaseName + "/" + splitRepoName[len(splitRepoName)-1] + dockerPath := "." if len(d.Dockerfile) != 0 { dockerPath = fmt.Sprintf("- < %s", d.Dockerfile) @@ -67,7 +70,7 @@ func (d *Docker) Write(f *buildfile.Buildfile, r *repo.Repo) { dockerServerUrl, d.Username, d.Password, d.Email)) f.WriteCmd(fmt.Sprintf("docker -H %s push %s", dockerServerUrl, dockerRepo)) - // Delete the image from the docker server we built on. + // Delete the image from the docker server we built on. f.WriteCmd(fmt.Sprintf("docker -H %s rmi %s:$(git rev-parse --short HEAD)", dockerServerUrl, dockerRepo)) }