TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-25 11:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALPINE.txt,Dockerfile{.base},build_docker.sh: bump alpine (#10543)

Browse Source 
Bump alpine base image version used to build tailscale/tailscale
and tailscale/k8s-operator images 3.16 -> 3.18

Updates #cleanup

Signed-off-by: Irbe Krumina <irbe@tailscale.com>
This commit is contained in:
Irbe Krumina 2023-12-11 07:03:18 +00:00 committed by GitHub
parent bac0df6949
commit 1b1b6bb634
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ALPINE.txt
View File

@ -1 +1 @@
3.16 3.18

2
Dockerfile
View File

@ -66,7 +66,7 @@ RUN GOARCH=$TARGETARCH go install -ldflags="\
-X tailscale.com/version.gitCommitStamp=$VERSION_GIT_HASH" \ -X tailscale.com/version.gitCommitStamp=$VERSION_GIT_HASH" \
-v ./cmd/tailscale ./cmd/tailscaled ./cmd/containerboot -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 RUN apk add --no-cache ca-certificates iptables iproute2 ip6tables
COPY --from=build-env /go/bin/* /usr/local/bin/ COPY --from=build-env /go/bin/* /usr/local/bin/

2
Dockerfile.base
View File

@ -1,5 +1,5 @@
# Copyright (c) Tailscale Inc & AUTHORS # Copyright (c) Tailscale Inc & AUTHORS
# SPDX-License-Identifier: BSD-3-Clause # 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 RUN apk add --no-cache ca-certificates iptables iproute2 ip6tables iputils

2
build_docker.sh
View File

@ -26,7 +26,7 @@ eval $(./build_dist.sh shellvars)
DEFAULT_TARGET="client" DEFAULT_TARGET="client"
DEFAULT_TAGS="v${VERSION_SHORT},v${VERSION_MINOR}" 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}" PUSH="${PUSH:-false}"
TARGET="${TARGET:-${DEFAULT_TARGET}}" TARGET="${TARGET:-${DEFAULT_TARGET}}"