Skip to content

Commit

Permalink
Merge pull request #1582 from RainbowMango/automated-cherry-pick-of-#…
Browse files Browse the repository at this point in the history
…1519-upstream-release-1.0

Automated cherry pick of #1519: bump alpine base image from v3.7 tov3.15.1
  • Loading branch information
karmada-bot committed Apr 7, 2022
2 parents 291d03a + 3c0cf09 commit a3ad1db
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion cluster/images/karmada-agent/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.7
FROM alpine:3.15.1

RUN apk add --no-cache ca-certificates

Expand Down
2 changes: 1 addition & 1 deletion cluster/images/karmada-aggregated-apiserver/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.7
FROM alpine:3.15.1

RUN apk add --no-cache ca-certificates

Expand Down
2 changes: 1 addition & 1 deletion cluster/images/karmada-controller-manager/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.7
FROM alpine:3.15.1

RUN apk add --no-cache ca-certificates

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.7
FROM alpine:3.15.1

RUN apk add --no-cache ca-certificates

Expand Down
2 changes: 1 addition & 1 deletion cluster/images/karmada-scheduler-estimator/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.7
FROM alpine:3.15.1

RUN apk add --no-cache ca-certificates

Expand Down
2 changes: 1 addition & 1 deletion cluster/images/karmada-scheduler/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.7
FROM alpine:3.15.1

RUN apk add --no-cache ca-certificates

Expand Down
2 changes: 1 addition & 1 deletion cluster/images/karmada-webhook/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.7
FROM alpine:3.15.1

RUN apk add --no-cache ca-certificates

Expand Down
2 changes: 1 addition & 1 deletion hack/local-up-karmada.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ dockerfile_list=( # Dockerfile files need to be replaced
"cluster/images/karmada-aggregated-apiserver/Dockerfile"
)
for dockerfile in "${dockerfile_list[@]}"; do
grep 'mirrors.ustc.edu.cn' ${REPO_ROOT}/${dockerfile} > /dev/null || sed -i'' -e "s#FROM alpine:3.7#FROM alpine:3.7\nRUN echo -e http://mirrors.ustc.edu.cn/alpine/v3.7/main/ > /etc/apk/repositories#" ${REPO_ROOT}/${dockerfile}
grep 'mirrors.ustc.edu.cn' ${REPO_ROOT}/${dockerfile} > /dev/null || sed -i'' -e "s#FROM alpine:3.15.1#FROM alpine:3.15.1\nRUN echo -e http://mirrors.ustc.edu.cn/alpine/v3.15/main/ > /etc/apk/repositories#" ${REPO_ROOT}/${dockerfile}
done
fi

Expand Down

0 comments on commit a3ad1db

Please sign in to comment.