diff --git a/ALPINE.txt b/ALPINE.txt index 1bc446c8a..55b698c77 100644 --- a/ALPINE.txt +++ b/ALPINE.txt @@ -1 +1 @@ -3.16 \ No newline at end of file +3.18 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 09a05f731..1694b7934 100644 --- a/Dockerfile +++ b/Dockerfile @@ -66,7 +66,7 @@ RUN GOARCH=$TARGETARCH go install -ldflags="\ -X tailscale.com/version.gitCommitStamp=$VERSION_GIT_HASH" \ -v ./cmd/tailscale ./cmd/tailscaled ./cmd/containerboot -FROM alpine:3.16 +FROM alpine:3.18 RUN apk add --no-cache ca-certificates iptables iproute2 ip6tables COPY --from=build-env /go/bin/* /usr/local/bin/ diff --git a/Dockerfile.base b/Dockerfile.base index be260eeea..eb4f0a02a 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -1,5 +1,5 @@ # Copyright (c) Tailscale Inc & AUTHORS # SPDX-License-Identifier: BSD-3-Clause -FROM alpine:3.16 +FROM alpine:3.18 RUN apk add --no-cache ca-certificates iptables iproute2 ip6tables iputils diff --git a/build_docker.sh b/build_docker.sh index 161dfd280..98237ab6d 100755 --- a/build_docker.sh +++ b/build_docker.sh @@ -26,7 +26,7 @@ eval $(./build_dist.sh shellvars) DEFAULT_TARGET="client" DEFAULT_TAGS="v${VERSION_SHORT},v${VERSION_MINOR}" -DEFAULT_BASE="tailscale/alpine-base:3.16" +DEFAULT_BASE="tailscale/alpine-base:3.18" PUSH="${PUSH:-false}" TARGET="${TARGET:-${DEFAULT_TARGET}}"