Merge pull request #106 from kencochrane/users

change registry address to https from http
2026-08-19 12:16:30 +00:00 · 2013-03-19 17:42:29 -07:00 · 2013-03-19 16:03:17 -07:00 · 2013-03-19 10:07:21 -07:00 · 2013-03-17 11:59:59 -07:00 · 2013-03-17 11:54:05 -07:00
2 changed files with 5 additions and 6 deletions
@@ -14,7 +14,7 @@ TMPDIR=$(shell mktemp -d -t XXXXXX)


 # Build a debian source package
-all: build_in_deb
+all: clean build_in_deb

 build_in_deb:
 	echo "GOPATH = " $(ROOT_PATH)
@@ -29,7 +29,7 @@ install:
 	install -m 0755 bin/docker $(DESTDIR)/$(INSDIR)
 	install -o root -m 0755 etc/docker.upstart $(DESTDIR)/etc/init/docker.conf

-$(BUILD_SRC): cleanup
+$(BUILD_SRC): clean
 	# Copy ourselves into $BUILD_SRC to comply with unusual golang constraints
 	tar --exclude=*.tar.gz --exclude=checkout.tgz -f checkout.tgz -cz *
 	mkdir -p $(BUILD_SRC)/$(GITHUB_PATH)
@@ -79,6 +79,5 @@ gotest:
 	done
 	@sudo rm -rf /tmp/docker-*

-cleanup:
-
-	rm -rf $(BUILD_PATH) debian/$(PKG_NAME)* debian/files $(BUILD_SRC) checkout.tgz
+clean:
+	rm -rf $(BUILD_PATH) debian/$(PKG_NAME)* debian/files $(BUILD_SRC) checkout.tgz bin
@@ -15,7 +15,7 @@ import (
 const CONFIGFILE = "/var/lib/docker/.dockercfg"

 // the registry server we want to login against
-const REGISTRY_SERVER = "http://registry.docker.io"
+const REGISTRY_SERVER = "https://registry.docker.io"

 type AuthConfig struct {
 	Username string `json:"username"`
Author	SHA1	Message	Date
Solomon Hykes	b1acd0a7b0	Merge pull request #106 from kencochrane/users change registry address to https from http	2013-03-19 17:42:29 -07:00
Ken Cochrane	8be58d3a7f	change registry address to https from http	2013-03-19 16:03:17 -07:00
Solomon Hykes	c5051ea0ea	Merge pull request #102 from fkautz/master Some minor cleanup of cleanup in Makefile	2013-03-19 10:07:21 -07:00
Frederick F. Kautz IV	6316b99556	Adding clean to beginning of all for cleaner builds.	2013-03-17 11:59:59 -07:00
Frederick F. Kautz IV	bb9ce6b287	Adding bin to clean	2013-03-17 11:54:05 -07:00
Frederick F. Kautz IV	a3ca3e9218	Makefile cleanup renamed to clean to match standard conventions.	2013-03-17 11:53:37 -07:00