Skip to content

Remove obsolete no-pic.patch from alpine images #213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 9, 2018
Merged

Remove obsolete no-pic.patch from alpine images #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d2c2fd
Remove obsolete no-pic.patch from alpine images
unkaktus Mar 17, 2018
55fafc6
Update 1.10 Dockerfile so build works
tianon Apr 9, 2018
8dca7d7
Update patch comment
tianon Apr 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions 1.10/alpine3.7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
16 changes: 0 additions & 16 deletions 1.10/alpine3.7/no-pic.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion 1.9/alpine3.6/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down
16 changes: 0 additions & 16 deletions 1.9/alpine3.6/no-pic.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion 1.9/alpine3.7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down
16 changes: 0 additions & 16 deletions 1.9/alpine3.7/no-pic.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile-alpine.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down
8 changes: 8 additions & 0 deletions update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down