Browse code

Remove download of man page generator dependencies, which are now in man/Dockerfile.\*

Signed-off-by: Daniel Nephin <dnephin@docker.com>

Daniel Nephin authored on 2016/09/08 00:02:51
Showing 5 changed files
... ...
@@ -209,15 +209,6 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
209 209
 	hello-world:latest@sha256:8be990ef2aeb16dbcb9271ddfe2610fa6658d13f6dfb8bc72074cc1ca36966a7
210 210
 # see also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
211 211
 
212
-# Download man page generator
213
-RUN set -x \
214
-	&& export GOPATH="$(mktemp -d)" \
215
-	&& git clone --depth 1 -b v1.0.5 https://github.com/cpuguy83/go-md2man.git "$GOPATH/src/github.com/cpuguy83/go-md2man" \
216
-	&& git clone --depth 1 -b v1.4 https://github.com/russross/blackfriday.git "$GOPATH/src/github.com/russross/blackfriday" \
217
-	&& go get -v -d github.com/cpuguy83/go-md2man \
218
-	&& go build -v -o /usr/local/bin/go-md2man github.com/cpuguy83/go-md2man \
219
-	&& rm -rf "$GOPATH"
220
-
221 212
 # Download toml validator
222 213
 ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
223 214
 RUN set -x \
... ...
@@ -165,15 +165,6 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
165 165
 	aarch64/hello-world:latest@sha256:65a4a158587b307bb02db4de41b836addb0c35175bdc801367b1ac1ddeb9afda
166 166
 # see also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
167 167
 
168
-# Download man page generator
169
-RUN set -x \
170
-	&& export GOPATH="$(mktemp -d)" \
171
-	&& git clone --depth 1 -b v1.0.5 https://github.com/cpuguy83/go-md2man.git "$GOPATH/src/github.com/cpuguy83/go-md2man" \
172
-	&& git clone --depth 1 -b v1.4 https://github.com/russross/blackfriday.git "$GOPATH/src/github.com/russross/blackfriday" \
173
-	&& go get -v -d github.com/cpuguy83/go-md2man \
174
-	&& go build -v -o /usr/local/bin/go-md2man github.com/cpuguy83/go-md2man \
175
-	&& rm -rf "$GOPATH"
176
-
177 168
 # Download toml validator
178 169
 ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
179 170
 RUN set -x \
... ...
@@ -163,15 +163,6 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
163 163
 	armhf/hello-world:latest@sha256:161dcecea0225975b2ad5f768058212c1e0d39e8211098666ffa1ac74cfb7791
164 164
 # see also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
165 165
 
166
-# Download man page generator
167
-RUN set -x \
168
-	&& export GOPATH="$(mktemp -d)" \
169
-	&& git clone --depth 1 -b v1.0.5 https://github.com/cpuguy83/go-md2man.git "$GOPATH/src/github.com/cpuguy83/go-md2man" \
170
-	&& git clone --depth 1 -b v1.4 https://github.com/russross/blackfriday.git "$GOPATH/src/github.com/russross/blackfriday" \
171
-	&& go get -v -d github.com/cpuguy83/go-md2man \
172
-	&& go build -v -o /usr/local/bin/go-md2man github.com/cpuguy83/go-md2man \
173
-	&& rm -rf "$GOPATH"
174
-
175 166
 # Download toml validator
176 167
 ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
177 168
 RUN set -x \
... ...
@@ -183,15 +183,6 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
183 183
 	ppc64le/hello-world:latest@sha256:186a40a9a02ca26df0b6c8acdfb8ac2f3ae6678996a838f977e57fac9d963974
184 184
 # see also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
185 185
 
186
-# Download man page generator
187
-RUN set -x \
188
-	&& export GOPATH="$(mktemp -d)" \
189
-	&& git clone --depth 1 -b v1.0.5 https://github.com/cpuguy83/go-md2man.git "$GOPATH/src/github.com/cpuguy83/go-md2man" \
190
-	&& git clone --depth 1 -b v1.4 https://github.com/russross/blackfriday.git "$GOPATH/src/github.com/russross/blackfriday" \
191
-	&& go get -v -d github.com/cpuguy83/go-md2man \
192
-	&& go build -v -o /usr/local/bin/go-md2man github.com/cpuguy83/go-md2man \
193
-	&& rm -rf "$GOPATH"
194
-
195 186
 # Download toml validator
196 187
 ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
197 188
 RUN set -x \
... ...
@@ -184,15 +184,6 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
184 184
 	s390x/hello-world:latest@sha256:780d80b3a7677c3788c0d5cd9168281320c8d4a6d9183892d8ee5cdd610f5699
185 185
 # see also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
186 186
 
187
-# Download man page generator
188
-RUN set -x \
189
-	&& export GOPATH="$(mktemp -d)" \
190
-	&& git clone --depth 1 -b v1.0.5 https://github.com/cpuguy83/go-md2man.git "$GOPATH/src/github.com/cpuguy83/go-md2man" \
191
-	&& git clone --depth 1 -b v1.4 https://github.com/russross/blackfriday.git "$GOPATH/src/github.com/russross/blackfriday" \
192
-	&& go get -v -d github.com/cpuguy83/go-md2man \
193
-	&& go build -v -o /usr/local/bin/go-md2man github.com/cpuguy83/go-md2man \
194
-	&& rm -rf "$GOPATH"
195
-
196 187
 # Download toml validator
197 188
 ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
198 189
 RUN set -x \