From 0f9339036b463b023d27e0a05e7d34d4a7831592 Mon Sep 17 00:00:00 2001 From: Nao YONASHIRO Date: Fri, 17 Aug 2018 22:14:15 +0900 Subject: [PATCH 1/2] feat: remove unused files --- Dockerfile-alpine.template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 609543de..c774ea3b 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -51,6 +51,8 @@ RUN set -eux; \ done; \ ./make.bash; \ \ + rm -rf /usr/local/go/pkg/bootstrap; \ + rm -rf /usr/local/go/pkg/obj/go-build/; \ rm -rf /go-alpine-patches; \ apk del .build-deps; \ \ From fd09bcfba2f2ec52318834df502b1a1907fa04f5 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 20 Aug 2018 16:27:36 -0700 Subject: [PATCH 2/2] Add comments, apply "update.sh" --- 1.10/alpine3.7/Dockerfile | 9 ++++++++- 1.10/alpine3.8/Dockerfile | 9 ++++++++- 1.11-rc/alpine3.7/Dockerfile | 9 ++++++++- 1.11-rc/alpine3.8/Dockerfile | 9 ++++++++- 1.9/alpine3.7/Dockerfile | 9 ++++++++- 1.9/alpine3.8/Dockerfile | 9 ++++++++- Dockerfile-alpine.template | 11 ++++++++--- 7 files changed, 56 insertions(+), 9 deletions(-) diff --git a/1.10/alpine3.7/Dockerfile b/1.10/alpine3.7/Dockerfile index dee775b2..e1cfdd36 100644 --- a/1.10/alpine3.7/Dockerfile +++ b/1.10/alpine3.7/Dockerfile @@ -51,7 +51,14 @@ RUN set -eux; \ done; \ ./make.bash; \ \ - rm -rf /go-alpine-patches; \ + rm -rf \ + /go-alpine-patches \ +# https://github.com/golang/go/blob/0b30cf534a03618162d3015c8705dd2231e34703/src/cmd/dist/buildtool.go#L121-L125 + /usr/local/go/pkg/bootstrap \ +# https://golang.org/cl/82095 +# https://github.com/golang/build/blob/e3fe1605c30f6a3fd136b561569933312ede8782/cmd/release/releaselet.go#L56 + /usr/local/go/pkg/obj \ + ; \ apk del .build-deps; \ \ export PATH="/usr/local/go/bin:$PATH"; \ diff --git a/1.10/alpine3.8/Dockerfile b/1.10/alpine3.8/Dockerfile index 49bb202e..13b44817 100644 --- a/1.10/alpine3.8/Dockerfile +++ b/1.10/alpine3.8/Dockerfile @@ -51,7 +51,14 @@ RUN set -eux; \ done; \ ./make.bash; \ \ - rm -rf /go-alpine-patches; \ + rm -rf \ + /go-alpine-patches \ +# https://github.com/golang/go/blob/0b30cf534a03618162d3015c8705dd2231e34703/src/cmd/dist/buildtool.go#L121-L125 + /usr/local/go/pkg/bootstrap \ +# https://golang.org/cl/82095 +# https://github.com/golang/build/blob/e3fe1605c30f6a3fd136b561569933312ede8782/cmd/release/releaselet.go#L56 + /usr/local/go/pkg/obj \ + ; \ apk del .build-deps; \ \ export PATH="/usr/local/go/bin:$PATH"; \ diff --git a/1.11-rc/alpine3.7/Dockerfile b/1.11-rc/alpine3.7/Dockerfile index 687d482e..22456237 100644 --- a/1.11-rc/alpine3.7/Dockerfile +++ b/1.11-rc/alpine3.7/Dockerfile @@ -51,7 +51,14 @@ RUN set -eux; \ done; \ ./make.bash; \ \ - rm -rf /go-alpine-patches; \ + rm -rf \ + /go-alpine-patches \ +# https://github.com/golang/go/blob/0b30cf534a03618162d3015c8705dd2231e34703/src/cmd/dist/buildtool.go#L121-L125 + /usr/local/go/pkg/bootstrap \ +# https://golang.org/cl/82095 +# https://github.com/golang/build/blob/e3fe1605c30f6a3fd136b561569933312ede8782/cmd/release/releaselet.go#L56 + /usr/local/go/pkg/obj \ + ; \ apk del .build-deps; \ \ export PATH="/usr/local/go/bin:$PATH"; \ diff --git a/1.11-rc/alpine3.8/Dockerfile b/1.11-rc/alpine3.8/Dockerfile index aad37d03..94341434 100644 --- a/1.11-rc/alpine3.8/Dockerfile +++ b/1.11-rc/alpine3.8/Dockerfile @@ -51,7 +51,14 @@ RUN set -eux; \ done; \ ./make.bash; \ \ - rm -rf /go-alpine-patches; \ + rm -rf \ + /go-alpine-patches \ +# https://github.com/golang/go/blob/0b30cf534a03618162d3015c8705dd2231e34703/src/cmd/dist/buildtool.go#L121-L125 + /usr/local/go/pkg/bootstrap \ +# https://golang.org/cl/82095 +# https://github.com/golang/build/blob/e3fe1605c30f6a3fd136b561569933312ede8782/cmd/release/releaselet.go#L56 + /usr/local/go/pkg/obj \ + ; \ apk del .build-deps; \ \ export PATH="/usr/local/go/bin:$PATH"; \ diff --git a/1.9/alpine3.7/Dockerfile b/1.9/alpine3.7/Dockerfile index 0959db2f..8fdff076 100644 --- a/1.9/alpine3.7/Dockerfile +++ b/1.9/alpine3.7/Dockerfile @@ -51,7 +51,14 @@ RUN set -eux; \ done; \ ./make.bash; \ \ - rm -rf /go-alpine-patches; \ + rm -rf \ + /go-alpine-patches \ +# https://github.com/golang/go/blob/0b30cf534a03618162d3015c8705dd2231e34703/src/cmd/dist/buildtool.go#L121-L125 + /usr/local/go/pkg/bootstrap \ +# https://golang.org/cl/82095 +# https://github.com/golang/build/blob/e3fe1605c30f6a3fd136b561569933312ede8782/cmd/release/releaselet.go#L56 + /usr/local/go/pkg/obj \ + ; \ apk del .build-deps; \ \ export PATH="/usr/local/go/bin:$PATH"; \ diff --git a/1.9/alpine3.8/Dockerfile b/1.9/alpine3.8/Dockerfile index e0166596..06f61ae6 100644 --- a/1.9/alpine3.8/Dockerfile +++ b/1.9/alpine3.8/Dockerfile @@ -51,7 +51,14 @@ RUN set -eux; \ done; \ ./make.bash; \ \ - rm -rf /go-alpine-patches; \ + rm -rf \ + /go-alpine-patches \ +# https://github.com/golang/go/blob/0b30cf534a03618162d3015c8705dd2231e34703/src/cmd/dist/buildtool.go#L121-L125 + /usr/local/go/pkg/bootstrap \ +# https://golang.org/cl/82095 +# https://github.com/golang/build/blob/e3fe1605c30f6a3fd136b561569933312ede8782/cmd/release/releaselet.go#L56 + /usr/local/go/pkg/obj \ + ; \ apk del .build-deps; \ \ export PATH="/usr/local/go/bin:$PATH"; \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index c774ea3b..15c44e1b 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -51,9 +51,14 @@ RUN set -eux; \ done; \ ./make.bash; \ \ - rm -rf /usr/local/go/pkg/bootstrap; \ - rm -rf /usr/local/go/pkg/obj/go-build/; \ - rm -rf /go-alpine-patches; \ + rm -rf \ + /go-alpine-patches \ +# https://github.com/golang/go/blob/0b30cf534a03618162d3015c8705dd2231e34703/src/cmd/dist/buildtool.go#L121-L125 + /usr/local/go/pkg/bootstrap \ +# https://golang.org/cl/82095 +# https://github.com/golang/build/blob/e3fe1605c30f6a3fd136b561569933312ede8782/cmd/release/releaselet.go#L56 + /usr/local/go/pkg/obj \ + ; \ apk del .build-deps; \ \ export PATH="/usr/local/go/bin:$PATH"; \