Skip to content

Commit

Permalink
Dockerfile: upgrade base image to alpine 3.10 (#1178)
Browse files Browse the repository at this point in the history
The 3.5 images are not maintained by upstream anymore, and 3.10 is
the latest stable branch.
  • Loading branch information
AstroProfundis authored and tennix committed Nov 20, 2019
1 parent 47c02b6 commit 42a1254
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions images/tidb-operator-e2e/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion images/tidb-operator/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/images/e2e/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.5
FROM alpine:3.10

ENV KUBECTL_VERSION=v1.12.2
ENV HELM_VERSION=v2.9.1
Expand Down
2 changes: 1 addition & 1 deletion tests/images/stability-test/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.5
FROM alpine:3.10

ENV KUBECTL_VERSION=v1.12.2
ENV HELM_VERSION=v2.9.1
Expand Down
2 changes: 1 addition & 1 deletion tests/images/test-apiserver/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM alpine:3.5
FROM alpine:3.10

ADD bin/tidb-apiserver /usr/local/bin/tidb-apiserver

0 comments on commit 42a1254

Please sign in to comment.