Skip to content
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

Jump to bottom

Alpine 3.14 #373

Merged
merged 1 commit into from
Jun 16, 2021
Merged

Alpine 3.14 #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 0 additions & 10 deletions 1.15/alpine3.13/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions 1.15/alpine3.12/Dockerfile → 1.15/alpine3.14/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions 1.16/alpine3.13/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 1 addition & 11 deletions 1.16/alpine3.12/Dockerfile → 1.16/alpine3.14/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions 1.17-rc/alpine3.13/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 1 addition & 11 deletions 1.17-rc/alpine3.12/Dockerfile → 1.17-rc/alpine3.14/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 16 additions & 4 deletions Dockerfile-alpine.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM alpine:{{ env.variant | ltrimstr("alpine") }}
{{ def alpine_version: env.variant | ltrimstr("alpine") -}}
FROM alpine:{{ alpine_version }}

RUN apk add --no-cache \
ca-certificates
Expand Down Expand Up @@ -76,17 +77,28 @@ RUN set -eux; \
cd /usr/local/go/src; \
# set GOROOT_BOOTSTRAP + GOHOST* such that we can build Go successfully
export GOROOT_BOOTSTRAP="$(go env GOROOT)" GOHOSTOS="$GOOS" GOHOSTARCH="$GOARCH"; \
if [ "${GO386:-}" = 'softfloat' ]; then \
{{
def need_386_hack:
(env.version == "1.15" and alpine_version != "3.13")
or (env.version != "1.15" and alpine_version == "3.13")
-}}
{{ if need_386_hack then ( -}}
if [ -n "${GO386:-}" ]; then \
# https://github.com/docker-library/golang/issues/359 -> https://github.com/golang/go/issues/44500
# (once our Alpine base has Go 1.16, we can remove this hack)
# Go 1.15 + Alpine 3.14 == Go 1.16 bootstrap
# Go 1.16 + Alpine 3.13 == Go 1.15 bootstrap
# (once Go 1.15 *and* Alpine 3.13 go away, we can remove this)
GO386= ./bootstrap.bash; \
export GOROOT_BOOTSTRAP="/usr/local/go-$GOOS-$GOARCH-bootstrap"; \
"$GOROOT_BOOTSTRAP/bin/go" version; \
fi; \
{{ ) else "" end -}}
./make.bash; \
if [ "${GO386:-}" = 'softfloat' ]; then \
{{ if need_386_hack then ( -}}
if [ -n "${GO386:-}" ]; then \
rm -rf "$GOROOT_BOOTSTRAP"; \
fi; \
{{ ) else "" end -}}
); \
\
# pre-compile the standard library, just like the official binary release tarballs do
Expand Down
2 changes: 1 addition & 1 deletion generate-stackbrew-library.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ defaultDebianSuite='buster'
declare -A debianSuite=(
#[1.13-rc]='buster'
)
defaultAlpineVersion='3.13'
defaultAlpineVersion='3.14'
declare -A alpineVersion=(
#[1.9]='3.7'
)
Expand Down
6 changes: 3 additions & 3 deletions versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@
"variants": [
"buster",
"stretch",
"alpine3.14",
"alpine3.13",
"alpine3.12",
"windows/windowsservercore-1809",
"windows/windowsservercore-ltsc2016",
"windows/nanoserver-1809"
Expand Down Expand Up @@ -290,8 +290,8 @@
"variants": [
"buster",
"stretch",
"alpine3.14",
"alpine3.13",
"alpine3.12",
"windows/windowsservercore-1809",
"windows/windowsservercore-ltsc2016",
"windows/nanoserver-1809"
Expand Down Expand Up @@ -453,8 +453,8 @@
"variants": [
"buster",
"stretch",
"alpine3.14",
"alpine3.13",
"alpine3.12",
"windows/windowsservercore-1809",
"windows/windowsservercore-ltsc2016",
"windows/nanoserver-1809"
Expand Down
4 changes: 2 additions & 2 deletions versions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ for version in "${versions[@]}"; do
"buster",
"stretch",
(
"3.13",
"3.12"
"3.14",
"3.13"
| "alpine" + .),
if .arches | has("windows-amd64") then
(
Expand Down