Use buster for base and web images too (#4567)

Requires setting iptables-legacy as the iptables provider.

Signed-off-by: Joakim Roubert <joakim.roubert@axis.com>
This commit is contained in:
Joakim Roubert 2020-06-15 19:49:26 +02:00 committed by GitHub
parent 755538b84a
commit 57f321b14b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 8 deletions

View File

@ -3,7 +3,7 @@
# This means that all Linkerd containers share a common set of tools, and furthermore, they
# are highly cacheable at runtime.
FROM debian:stretch-20190812-slim
FROM debian:buster-20200514-slim
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
@ -13,3 +13,8 @@ RUN apt-get update \
jq \
nghttp2 \
&& rm -rf /var/lib/apt/lists/*
# Switching base image from stretch to buster, we need to use iptables-legacy
# if no changes to how iptables is invoked are done.
RUN update-alternatives --set iptables /usr/sbin/iptables-legacy \
&& update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy

View File

@ -1,4 +1,4 @@
FROM gcr.io/linkerd-io/base:2019-09-04.01
FROM gcr.io/linkerd-io/base:2020-06-08.01
RUN apt-get update && apt-get install -y --no-install-recommends \
tcpdump \
iproute2 \

View File

@ -15,7 +15,7 @@ rootdir=$( cd "$bindir"/.. && pwd )
# shellcheck source=_docker.sh
. "$bindir"/_docker.sh
tag=2019-09-04.01
tag=2020-06-08.01
if (docker_pull base $tag); then
echo "$(docker_repo base):$tag"

View File

@ -9,5 +9,5 @@ bindir=$( cd "${BASH_SOURCE[0]%/*}" && pwd )
# shellcheck source=_tag.sh
. "$bindir"/_tag.sh
docker_pull base 2019-09-04.01 || true
docker_pull base 2020-06-08.01 || true
docker_pull go-deps "$(go_deps_sha)" || true

View File

@ -9,5 +9,5 @@ bindir=$( cd "${BASH_SOURCE[0]%/*}" && pwd )
# shellcheck source=_tag.sh
. "$bindir"/_tag.sh
docker_push base 2019-09-04.01
docker_push base 2020-06-08.01
docker_push go-deps "$(go_deps_sha)"

View File

@ -6,7 +6,7 @@ COPY controller controller
COPY cni-plugin cni-plugin
RUN CGO_ENABLED=0 GOOS=linux go build -o /go/bin/linkerd-cni -v -mod=readonly ./cni-plugin/
FROM gcr.io/linkerd-io/base:2019-09-04.01
FROM gcr.io/linkerd-io/base:2020-06-08.01
WORKDIR /linkerd
RUN curl -kL -o $(which jq) https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64
COPY --from=golang /go/bin/linkerd-cni /opt/cni/bin/

View File

@ -1,5 +1,5 @@
## bundle web assets
FROM node:14-stretch as webpack-bundle
FROM node:14-buster as webpack-bundle
RUN curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.21.1 --network-concurrency 1
ENV PATH /root/.yarn/bin:$PATH
@ -32,7 +32,7 @@ COPY pkg pkg
RUN CGO_ENABLED=0 GOOS=linux go build -mod=readonly -o web/web -ldflags "-s -w" ./web
## package it all up
FROM debian:stretch-20190812-slim
FROM debian:buster-20200514-slim
WORKDIR /linkerd
COPY LICENSE .