Skip to content

Commit 55fafc6

Browse files
committed
Update 1.10 Dockerfile so build works
1 parent 5d2c2fd commit 55fafc6

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

1.10/alpine3.7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ RUN apk add --no-cache ca-certificates
55
ENV GOLANG_VERSION 1.10.1
66

77
# no-pic.patch: https://golang.org/issue/14851 (Go 1.8 & 1.7)
8-
COPY *.patch /go-alpine-patches/
8+
#COPY *.patch /go-alpine-patches/
99

1010
RUN set -eux; \
1111
apk add --no-cache --virtual .build-deps \

update.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,14 @@ for version in "${versions[@]}"; do
112112
;;
113113
esac
114114

115+
(
116+
shopt -s nullglob
117+
variantPatches=( "$version/$variant/"*.patch )
118+
if [ "${#variantPatches[@]}" -eq 0 ]; then
119+
sed -ri 's/^COPY.*patch/#&/' "$version/$variant/Dockerfile"
120+
fi
121+
)
122+
115123
travisEnv='\n - VERSION='"$version VARIANT=$variant$travisEnv"
116124
fi
117125
done

0 commit comments

Comments
 (0)