Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dockerfile: upgrade base image to alpine 3.10 #1178

Merged
merged 4 commits into from
Nov 20, 2019
Merged

Dockerfile: upgrade base image to alpine 3.10 #1178

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
79413fd
Dockerfile: upgrade base image to alpine 3.10
AstroProfundis Nov 18, 2019
428a95f
Merge branch 'master' into upgrade-base-image
cofyc Nov 19, 2019
9e0b1b8
Merge branch 'master' into upgrade-base-image
cofyc Nov 20, 2019
c87a2ec
Merge branch 'master' into upgrade-base-image
tennix Nov 20, 2019
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
6 changes: 3 additions & 3 deletions images/tidb-operator-e2e/Dockerfile
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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