From c5c8702867ee24a58b966758183f001060922754 Mon Sep 17 00:00:00 2001 From: Denys Smirnov Date: Wed, 7 Feb 2018 20:33:18 +0200 Subject: [PATCH] do not rely on workdir while running wget in Docker build Signed-off-by: Denys Smirnov --- assets/build/bindata.go | 4 ++-- etc/build/etc/build/Dockerfile.build.alpine.tpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/build/bindata.go b/assets/build/bindata.go index 7efffef4..b382c992 100644 --- a/assets/build/bindata.go +++ b/assets/build/bindata.go @@ -107,7 +107,7 @@ ENV GOLANG_SRC_URL https://golang.org/dl/go${RUNTIME_GO_VERSION}.src.tar.gz # from https://github.com/docker-library/golang/blob/master/1.8/alpine/Dockerfile RUN apk add --update --no-cache ca-certificates openssl && update-ca-certificates -RUN wget https://raw.githubusercontent.com/docker-library/golang/132cd70768e3bc269902e4c7b579203f66dc9f64/1.8/alpine/no-pic.patch +RUN wget https://raw.githubusercontent.com/docker-library/golang/132cd70768e3bc269902e4c7b579203f66dc9f64/1.8/alpine/no-pic.patch -O /no-pic.patch RUN set -ex \ && apk add --no-cache --virtual .build-deps \ @@ -144,7 +144,7 @@ func etcBuildDockerfileBuildAlpineTpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "etc/build/Dockerfile.build.alpine.tpl", size: 943, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "etc/build/Dockerfile.build.alpine.tpl", size: 960, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/etc/build/etc/build/Dockerfile.build.alpine.tpl b/etc/build/etc/build/Dockerfile.build.alpine.tpl index 55d619bf..b057606a 100644 --- a/etc/build/etc/build/Dockerfile.build.alpine.tpl +++ b/etc/build/etc/build/Dockerfile.build.alpine.tpl @@ -5,7 +5,7 @@ ENV GOLANG_SRC_URL https://golang.org/dl/go${RUNTIME_GO_VERSION}.src.tar.gz # from https://github.com/docker-library/golang/blob/master/1.8/alpine/Dockerfile RUN apk add --update --no-cache ca-certificates openssl && update-ca-certificates -RUN wget https://raw.githubusercontent.com/docker-library/golang/132cd70768e3bc269902e4c7b579203f66dc9f64/1.8/alpine/no-pic.patch +RUN wget https://raw.githubusercontent.com/docker-library/golang/132cd70768e3bc269902e4c7b579203f66dc9f64/1.8/alpine/no-pic.patch -O /no-pic.patch RUN set -ex \ && apk add --no-cache --virtual .build-deps \