From 42a1254a62cf11e961e635c0157046a59871a3ef Mon Sep 17 00:00:00 2001 From: Allen Zhong Date: Wed, 20 Nov 2019 18:04:00 +0800 Subject: [PATCH] Dockerfile: upgrade base image to alpine 3.10 (#1178) The 3.5 images are not maintained by upstream anymore, and 3.10 is the latest stable branch. --- images/tidb-operator-e2e/Dockerfile | 6 +++--- images/tidb-operator/Dockerfile | 2 +- tests/images/e2e/Dockerfile | 2 +- tests/images/stability-test/Dockerfile | 2 +- tests/images/test-apiserver/Dockerfile | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/images/tidb-operator-e2e/Dockerfile b/images/tidb-operator-e2e/Dockerfile index be4ff4d47e..ddf49df133 100644 --- a/images/tidb-operator-e2e/Dockerfile +++ b/images/tidb-operator-e2e/Dockerfile @@ -3,20 +3,20 @@ FROM golang:1.10-alpine AS builder # Uncomment these lines to hack the repositories # RUN echo "https://mirrors.tuna.tsinghua.edu.cn/alpine/v3.3/main" > /etc/apk/repositories && \ -# echo "https://mirrors.tuna.tsinghua.edu.cn/alpine/v3.5/community" >> /etc/apk/repositories +# echo "https://mirrors.tuna.tsinghua.edu.cn/alpine/v3.10/community" >> /etc/apk/repositories RUN apk update && apk add --no-cache git RUN go get github.com/onsi/ginkgo/ginkgo # Executable image -FROM alpine:3.5 +FROM alpine:3.10 ENV KUBECTL_VERSION=v1.10.2 ENV HELM_VERSION=v2.9.1 # Uncomment these lines to hack the repositories # RUN echo "https://mirrors.tuna.tsinghua.edu.cn/alpine/v3.3/main" > /etc/apk/repositories && \ -# echo "https://mirrors.tuna.tsinghua.edu.cn/alpine/v3.5/community" >> /etc/apk/repositories +# echo "https://mirrors.tuna.tsinghua.edu.cn/alpine/v3.10/community" >> /etc/apk/repositories RUN apk update && apk add --no-cache ca-certificates curl diff --git a/images/tidb-operator/Dockerfile b/images/tidb-operator/Dockerfile index 4cf7cfdc45..a4c9d7cd74 100644 --- a/images/tidb-operator/Dockerfile +++ b/images/tidb-operator/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.5 +FROM alpine:3.10 RUN apk add tzdata --no-cache ADD bin/tidb-scheduler /usr/local/bin/tidb-scheduler diff --git a/tests/images/e2e/Dockerfile b/tests/images/e2e/Dockerfile index 84f405d97c..6121775f6c 100644 --- a/tests/images/e2e/Dockerfile +++ b/tests/images/e2e/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.5 +FROM alpine:3.10 ENV KUBECTL_VERSION=v1.12.2 ENV HELM_VERSION=v2.9.1 diff --git a/tests/images/stability-test/Dockerfile b/tests/images/stability-test/Dockerfile index f71dc3480c..013739e055 100644 --- a/tests/images/stability-test/Dockerfile +++ b/tests/images/stability-test/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.5 +FROM alpine:3.10 ENV KUBECTL_VERSION=v1.12.2 ENV HELM_VERSION=v2.9.1 diff --git a/tests/images/test-apiserver/Dockerfile b/tests/images/test-apiserver/Dockerfile index 341490b251..98222bfd8e 100644 --- a/tests/images/test-apiserver/Dockerfile +++ b/tests/images/test-apiserver/Dockerfile @@ -1,3 +1,3 @@ -FROM alpine:3.5 +FROM alpine:3.10 ADD bin/tidb-apiserver /usr/local/bin/tidb-apiserver