Skip to content

Commit e88786c

Browse files
rscgopherbot
authored andcommitted
env/linux-x86-alpine: update to Alpine 3.16
Also update Go version in buildlet/stage0 to make build work again. For golang/go#54306 (but does not fix it). Change-Id: I7dd656de9cb9f563b816929330fa53059c93b5b8 Reviewed-on: https://go-review.googlesource.com/c/build/+/422097 Run-TryBot: Russ Cox <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> Auto-Submit: Russ Cox <[email protected]> TryBot-Result: Gopher Robot <[email protected]>
1 parent f59fccd commit e88786c

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

cmd/buildlet/stage0/Dockerfile

+3-6
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22
# Use of this source code is governed by a BSD-style
33
# license that can be found in the LICENSE file.
44

5-
FROM golang:1.13 AS build
6-
LABEL maintainer "[email protected]"
7-
8-
ENV GO111MODULE=on
9-
ENV GOPROXY=https://proxy.golang.org
5+
FROM golang:1.19 AS build
6+
LABEL maintainer="[email protected]"
107

118
RUN mkdir /gocache
129
ENV GOCACHE /gocache
@@ -26,6 +23,6 @@ COPY . /go/src/golang.org/x/build/
2623
RUN go install golang.org/x/build/cmd/buildlet/stage0
2724
RUN CGO_ENABLED=0 go build -o /go/bin/stage0.static golang.org/x/build/cmd/buildlet/stage0
2825

29-
FROM golang:1.13
26+
FROM golang:1.19
3027
COPY --from=build /go/bin/stage0 /go/bin/stage0
3128
COPY --from=build /go/bin/stage0.static /go/bin/stage0.static

env/linux-x86-alpine/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
FROM golang/buildlet-stage0 AS stage0
1010

11-
FROM alpine:3.10
11+
FROM alpine:3.16
1212
MAINTAINER golang-dev <[email protected]>
1313

1414
RUN apk add --no-cache \
@@ -31,7 +31,7 @@ RUN apk add --no-cache \
3131

3232
RUN ssh-keygen -A
3333
RUN bash -c "(echo ChallengeResponseAuthentication no; echo PasswordAuthentication no; echo PermitRootLogin yes) > /etc/ssh/sshd_config"
34-
RUN passwd -u root
34+
RUN bash -c "passwd -u root || true" # might already be unlocked
3535

3636
COPY --from=stage0 /go/bin/stage0.static /usr/local/bin/stage0
3737

0 commit comments

Comments
 (0)