Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile-base
Original file line number Diff line number Diff line change
Expand Up @@ -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:buster-20190910-slim
FROM debian:stretch-20190812-slim

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-debug
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/linkerd-io/base:2019-09-17.01
FROM gcr.io/linkerd-io/base:2019-09-04.01
RUN apt-get update && apt-get install -y --no-install-recommends \
tcpdump \
iproute2 \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-proxy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG RUNTIME_IMAGE=debian:buster-20190910-slim
ARG RUNTIME_IMAGE=debian:stretch-20190812-slim

FROM debian:stretch-20190812-slim as fetch
RUN apt-get update && apt-get install -y ca-certificates curl
Expand Down
2 changes: 1 addition & 1 deletion bin/docker-build-base
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ rootdir="$( cd $bindir/.. && pwd )"

. $bindir/_docker.sh

tag="2019-09-17.01"
tag="2019-09-04.01"

if (docker_pull base "${tag}"); then
echo "$(docker_repo base):${tag}"
Expand Down
2 changes: 1 addition & 1 deletion bin/docker-pull-deps
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ bindir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
. $bindir/_docker.sh
. $bindir/_tag.sh

docker_pull base 2019-09-17.01 || true
docker_pull base 2019-09-04.01 || true
docker_pull go-deps "$(go_deps_sha)" || true
2 changes: 1 addition & 1 deletion bin/docker-push-deps
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ bindir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
. $bindir/_docker.sh
. $bindir/_tag.sh

docker_push base 2019-09-17.01
docker_push base 2019-09-04.01
docker_push go-deps "$(go_deps_sha)"
2 changes: 1 addition & 1 deletion cni-plugin/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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-17.01
FROM gcr.io/linkerd-io/base:2019-09-04.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/
Expand Down
2 changes: 1 addition & 1 deletion web/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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:buster-20190910-slim
FROM debian:stretch-20190812-slim
WORKDIR /linkerd

COPY LICENSE .
Expand Down