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

update lightning&br version to v4.0.2 #2865

Merged
merged 3 commits into from
Jul 4, 2020
Merged

update lightning&br version to v4.0.2 #2865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66ba1b3
update lightning&br version to v4.0.2
lichunzhu Jul 3, 2020
8ae6124
Merge branch 'master' into updateLightningVersion
lichunzhu Jul 3, 2020
d4e1f31
update local-up-operator.sh to support use local backup image
lichunzhu Jul 3, 2020
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: 2 additions & 0 deletions hack/local-up-operator.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ fi
echo "info: loading images into cluster"
images=(
$DOCKER_REGISTRY/pingcap/tidb-operator:${IMAGE_TAG}
$DOCKER_REGISTRY/pingcap/tidb-backup-manager:${IMAGE_TAG}
)
for n in ${images[@]}; do
echo "info: loading image $n"
Expand All @@ -176,6 +177,7 @@ helm_args=(
--name tidb-operator-dev
--namespace "$NAMESPACE"
--set-string operatorImage=$DOCKER_REGISTRY/pingcap/tidb-operator:${IMAGE_TAG}
--set-string tidbBackupManagerImage=$DOCKER_REGISTRY/pingcap/tidb-backup-manager:${IMAGE_TAG}
--set-string controllerManager.logLevel=4
--set-string scheduler.logLevel=4
)
Expand Down
4 changes: 2 additions & 2 deletions images/tidb-backup-manager/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM pingcap/tidb-enterprise-tools:latest
ARG VERSION=v1.51.0
ARG SHUSH_VERSION=v1.4.0
ARG TOOLKIT_VERSION=v3.0.15
ARG TOOLKIT_VERSION=v4.0.2
ARG TOOLKIT_V31=v3.1.2
ARG TOOLKIT_V40=v4.0.1
ARG TOOLKIT_V40=v4.0.2
RUN apk update && apk add ca-certificates

RUN wget -nv https://github.com/ncw/rclone/releases/download/${VERSION}/rclone-${VERSION}-linux-amd64.zip \
Expand Down