ALPINE.txt: bump to 3.18

Updates #cleanup Signed-off-by: Maisem Ali <maisem@tailscale.com>
2023-06-18 07:54:13 -07:00
4 changed files with 5 additions and 5 deletions
--- a/ALPINE.txt
+++ b/ALPINE.txt
@ -1 +1 @@
-3.16
+3.18
--- a/2
+++ b/2
@ -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/
--- 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
--- 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}}"
@ -71,4 +71,4 @@ case "$TARGET" in
    echo "unknown target: $TARGET"
    exit 1
    ;;
-esac
+esac
 @ -1 +1 @@
 .16
 .18