1. docker
  2. Commit 2bc57578c604818514101fe643494b238902e49a
Browse code

Sort make targets and DOCKER_ENV vars in alphabetical order

Signed-off-by: Dieter Reuter <dieter.reuter@me.com>

Dieter Reuter authored on 2015/11/22 01:31:25
Showing 1 changed files
Makefile
History View file @ 2bc5757
... ... 
@@ -1,4 +1,4 @@
1 
-.PHONY: all binary build cross default docs docs-build docs-shell shell test test-unit test-integration-cli test-docker-py validate
1 
+.PHONY: all binary build cross default docs docs-build docs-shell shell test test-docker-py test-integration-cli test-unit validate
2 2
3 3 
 # get OS/Arch of docker engine
4 4 
 DOCKER_ENGINE_OSARCH = $(shell docker version | grep 'OS/Arch' | tail -1 | cut -d':' -f2 | tr -d '[[:space:]]')
... ... 
@@ -22,15 +22,15 @@ DOCKER_ENVS := \
22 22 
 	-e BUILDFLAGS \
23 23 
 	-e DOCKER_CLIENTONLY \
24 24 
 	-e DOCKER_DEBUG \
25 
+	-e DOCKER_ENGINE_GOARCH \
26 
+	-e DOCKER_ENGINE_GOOS \
27 
+	-e DOCKER_ENGINE_OSARCH \
25 28 
 	-e DOCKER_EXPERIMENTAL \
26 
-	-e DOCKER_REMAP_ROOT \
29 
+	-e DOCKER_FILE \
27 30 
 	-e DOCKER_GRAPHDRIVER \
31 
+	-e DOCKER_REMAP_ROOT \
28 32 
 	-e DOCKER_STORAGE_OPTS \
29 33 
 	-e DOCKER_USERLANDPROXY \
30 
-	-e DOCKER_ENGINE_OSARCH \
31 
-	-e DOCKER_ENGINE_GOOS \
32 
-	-e DOCKER_ENGINE_GOARCH \
33 
-	-e DOCKER_FILE \
34 34 
 	-e TESTDIRS \
35 35 
 	-e TESTFLAGS \
36 36 
 	-e TIMEOUT
... ... 
@@ -67,38 +67,38 @@ all: build
67 67 
 binary: build
68 68 
 	$(DOCKER_RUN_DOCKER) hack/make.sh binary
69 69
70 
+build: bundles
71 
+	docker build -t "$(DOCKER_IMAGE)" -f $(DOCKER_FILE) .
72 
+
73 
+bundles:
74 
+	mkdir bundles
75 
+
70 76 
 cross: build
71 77 
 	$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary binary cross
72 78
73 79 
 deb: build
74 80 
 	$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary build-deb
75 81
82 
+docs:
83 
+	$(MAKE) -C docs docs
84 
+
76 85 
 rpm: build
77 86 
 	$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary build-rpm
78 87
88 
+shell: build
89 
+	$(DOCKER_RUN_DOCKER) bash
90 
+
79 91 
 test: build
80 92 
 	$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary cross test-unit test-integration-cli test-docker-py
81 93
82 
-test-unit: build
83 
-	$(DOCKER_RUN_DOCKER) hack/make.sh test-unit
94 
+test-docker-py: build
95 
+	$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary test-docker-py
84 96
85 97 
 test-integration-cli: build
86 98 
 	$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary test-integration-cli
87 99
88 
-test-docker-py: build
89 
-	$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary test-docker-py
100 
+test-unit: build
101 
+	$(DOCKER_RUN_DOCKER) hack/make.sh test-unit
90 102
91 103 
 validate: build
92 104 
 	$(DOCKER_RUN_DOCKER) hack/make.sh validate-dco validate-gofmt validate-pkg validate-lint validate-test validate-toml validate-vet
93 
-
94 
-shell: build
95 
-	$(DOCKER_RUN_DOCKER) bash
96 
-
97 
-build: bundles
98 
-	docker build -t "$(DOCKER_IMAGE)" -f $(DOCKER_FILE) .
99 
-
100 
-bundles:
101 
-	mkdir bundles
102 
-
103 
-docs:
104 
-	$(MAKE) -C docs docs