From d0fa13a50201cdcef849b0c2ae67b0747222a1c6 Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Wed, 7 Sep 2016 11:02:51 -0400 Subject: [PATCH] Remove download of man page generator dependencies, which are now in man/Dockerfile.\* Signed-off-by: Daniel Nephin --- Dockerfile | 9 --------- Dockerfile.aarch64 | 9 --------- Dockerfile.armhf | 9 --------- Dockerfile.ppc64le | 9 --------- Dockerfile.s390x | 9 --------- 5 files changed, 45 deletions(-) diff --git a/Dockerfile b/Dockerfile index f9129186560eb5ac0812f2c6389651431cfa35fe..9286c379d626cd9ae913262632a33e3b9111c4ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -209,15 +209,6 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ hello-world:latest@sha256:8be990ef2aeb16dbcb9271ddfe2610fa6658d13f6dfb8bc72074cc1ca36966a7 # see also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is) -# Download man page generator -RUN set -x \ - && export GOPATH="$(mktemp -d)" \ - && git clone --depth 1 -b v1.0.5 https://github.com/cpuguy83/go-md2man.git "$GOPATH/src/github.com/cpuguy83/go-md2man" \ - && git clone --depth 1 -b v1.4 https://github.com/russross/blackfriday.git "$GOPATH/src/github.com/russross/blackfriday" \ - && go get -v -d github.com/cpuguy83/go-md2man \ - && go build -v -o /usr/local/bin/go-md2man github.com/cpuguy83/go-md2man \ - && rm -rf "$GOPATH" - # Download toml validator ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a RUN set -x \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 90c6d45561ec16391705253bd1cb1aadd23a2190..85e1db400e81826521ada40ac48a9fc212977e7f 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -165,15 +165,6 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ aarch64/hello-world:latest@sha256:65a4a158587b307bb02db4de41b836addb0c35175bdc801367b1ac1ddeb9afda # see also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is) -# Download man page generator -RUN set -x \ - && export GOPATH="$(mktemp -d)" \ - && git clone --depth 1 -b v1.0.5 https://github.com/cpuguy83/go-md2man.git "$GOPATH/src/github.com/cpuguy83/go-md2man" \ - && git clone --depth 1 -b v1.4 https://github.com/russross/blackfriday.git "$GOPATH/src/github.com/russross/blackfriday" \ - && go get -v -d github.com/cpuguy83/go-md2man \ - && go build -v -o /usr/local/bin/go-md2man github.com/cpuguy83/go-md2man \ - && rm -rf "$GOPATH" - # Download toml validator ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a RUN set -x \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index ab436b3d7bfbf09f25286a3ae43e45bee4db52ff..84da40d73b4ab52000a501c65a70548709558d5b 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -163,15 +163,6 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ armhf/hello-world:latest@sha256:161dcecea0225975b2ad5f768058212c1e0d39e8211098666ffa1ac74cfb7791 # see also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is) -# Download man page generator -RUN set -x \ - && export GOPATH="$(mktemp -d)" \ - && git clone --depth 1 -b v1.0.5 https://github.com/cpuguy83/go-md2man.git "$GOPATH/src/github.com/cpuguy83/go-md2man" \ - && git clone --depth 1 -b v1.4 https://github.com/russross/blackfriday.git "$GOPATH/src/github.com/russross/blackfriday" \ - && go get -v -d github.com/cpuguy83/go-md2man \ - && go build -v -o /usr/local/bin/go-md2man github.com/cpuguy83/go-md2man \ - && rm -rf "$GOPATH" - # Download toml validator ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a RUN set -x \ diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le index c597e8e23504784b11e92e9f74f09c3348fbeac3..033fd9abb219bc932f641fce1b3ef5d6b1852f42 100644 --- a/Dockerfile.ppc64le +++ b/Dockerfile.ppc64le @@ -183,15 +183,6 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ ppc64le/hello-world:latest@sha256:186a40a9a02ca26df0b6c8acdfb8ac2f3ae6678996a838f977e57fac9d963974 # see also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is) -# Download man page generator -RUN set -x \ - && export GOPATH="$(mktemp -d)" \ - && git clone --depth 1 -b v1.0.5 https://github.com/cpuguy83/go-md2man.git "$GOPATH/src/github.com/cpuguy83/go-md2man" \ - && git clone --depth 1 -b v1.4 https://github.com/russross/blackfriday.git "$GOPATH/src/github.com/russross/blackfriday" \ - && go get -v -d github.com/cpuguy83/go-md2man \ - && go build -v -o /usr/local/bin/go-md2man github.com/cpuguy83/go-md2man \ - && rm -rf "$GOPATH" - # Download toml validator ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a RUN set -x \ diff --git a/Dockerfile.s390x b/Dockerfile.s390x index 7f685162511124da01e0e9efe398c1268eea14cb..7d52c87c76879f1587e4045cc28e2b4e23c4bdd6 100644 --- a/Dockerfile.s390x +++ b/Dockerfile.s390x @@ -184,15 +184,6 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ s390x/hello-world:latest@sha256:780d80b3a7677c3788c0d5cd9168281320c8d4a6d9183892d8ee5cdd610f5699 # see also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is) -# Download man page generator -RUN set -x \ - && export GOPATH="$(mktemp -d)" \ - && git clone --depth 1 -b v1.0.5 https://github.com/cpuguy83/go-md2man.git "$GOPATH/src/github.com/cpuguy83/go-md2man" \ - && git clone --depth 1 -b v1.4 https://github.com/russross/blackfriday.git "$GOPATH/src/github.com/russross/blackfriday" \ - && go get -v -d github.com/cpuguy83/go-md2man \ - && go build -v -o /usr/local/bin/go-md2man github.com/cpuguy83/go-md2man \ - && rm -rf "$GOPATH" - # Download toml validator ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a RUN set -x \