Merge pull request #213 from nogoegst/remove-nopic-patch

Remove obsolete no-pic.patch from alpine images

Author: tianon

1.10/alpine3.7/Dockerfile

@@ -4,8 +4,8 @@ RUN apk add --no-cache ca-certificates
 
 ENV GOLANG_VERSION 1.10.1
 
-# no-pic.patch: https://golang.org/issue/14851 (Go 1.8 & 1.7)
-COPY *.patch /go-alpine-patches/
+# make-sure-R0-is-zero-before-main-on-ppc64le.patch: https://github.com/golang/go/commit/9aea0e89b6df032c29d0add8d69ba2c95f1106d9 (Go 1.9)
+#COPY *.patch /go-alpine-patches/
 
 RUN set -eux; \
 	apk add --no-cache --virtual .build-deps \

1.10/alpine3.7/no-pic.patch

@@ -4,7 +4,7 @@ RUN apk add --no-cache ca-certificates
 
 ENV GOLANG_VERSION 1.9.5
 
-# no-pic.patch: https://golang.org/issue/14851 (Go 1.8 & 1.7)
+# make-sure-R0-is-zero-before-main-on-ppc64le.patch: https://github.com/golang/go/commit/9aea0e89b6df032c29d0add8d69ba2c95f1106d9 (Go 1.9)
 COPY *.patch /go-alpine-patches/
 
 RUN set -eux; \

1.9/alpine3.6/Dockerfile

@@ -4,7 +4,7 @@ RUN apk add --no-cache ca-certificates
 
 ENV GOLANG_VERSION 1.9.5
 
-# no-pic.patch: https://golang.org/issue/14851 (Go 1.8 & 1.7)
+# make-sure-R0-is-zero-before-main-on-ppc64le.patch: https://github.com/golang/go/commit/9aea0e89b6df032c29d0add8d69ba2c95f1106d9 (Go 1.9)
 COPY *.patch /go-alpine-patches/
 
 RUN set -eux; \

1.9/alpine3.6/no-pic.patch

@@ -4,7 +4,7 @@ RUN apk add --no-cache ca-certificates
 
 ENV GOLANG_VERSION %%VERSION%%
 
-# no-pic.patch: https://golang.org/issue/14851 (Go 1.8 & 1.7)
+# make-sure-R0-is-zero-before-main-on-ppc64le.patch: https://github.com/golang/go/commit/9aea0e89b6df032c29d0add8d69ba2c95f1106d9 (Go 1.9)
 COPY *.patch /go-alpine-patches/
 
 RUN set -eux; \

1.9/alpine3.7/Dockerfile

@@ -112,6 +112,14 @@ for version in "${versions[@]}"; do
 					;;
 			esac
 
+			(
+				shopt -s nullglob
+				variantPatches=( "$version/$variant/"*.patch )
+				if [ "${#variantPatches[@]}" -eq 0 ]; then
+					sed -ri 's/^COPY.*patch/#&/' "$version/$variant/Dockerfile"
+				fi
+			)
+
 			travisEnv='\n  - VERSION='"$version VARIANT=$variant$travisEnv"
 		fi
 	done