From 45f809e444c4beceb1040b8930ecebd37cd560b7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2024 04:49:23 +0000 Subject: [PATCH] chore(deps): update ghcr.io/oras-project/oras docker tag to v1.2.0 (#320) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | ghcr.io/oras-project/oras | stage | minor | `v1.1.0` -> `v1.2.0` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/PingCAP-QE/artifacts). --------- Signed-off-by: wuhuizuo Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: wuhuizuo --- dockerfiles/cd/utils/release/Dockerfile | 20 +++++++++---------- ...gen-package-offline-package-with-config.sh | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dockerfiles/cd/utils/release/Dockerfile b/dockerfiles/cd/utils/release/Dockerfile index 78f30179..a8c6aa6f 100644 --- a/dockerfiles/cd/utils/release/Dockerfile +++ b/dockerfiles/cd/utils/release/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.4-alpine3.19 as gomplate_builder +FROM golang:1.22.4-alpine3.20 as gomplate_builder RUN wget https://github.com/hairyhenderson/gomplate/archive/refs/heads/main.zip -O - | unzip - && cd gomplate-main && go build -o /usr/local/bin/gomplate ./cmd/gomplate @@ -16,24 +16,24 @@ RUN apk add --no-cache bash git jq yq uuidgen COPY --from=gomplate_builder --chown=0:0 /usr/local/bin/gomplate /usr/local/bin/gomplate # install tools: oras -COPY --from=ghcr.io/oras-project/oras:v1.1.0 --chown=0:0 /bin/oras /usr/local/bin/oras +COPY --from=ghcr.io/oras-project/oras:v1.2.0 --chown=0:0 /bin/oras /usr/local/bin/oras # install tools: manifest-tool -COPY --from=mplatform/manifest-tool:alpine-v2.1.3 --chown=0:0 /manifest-tool /usr/local/bin/manifest-tool -COPY --from=mplatform/manifest-tool:alpine-v2.1.3 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=mplatform/manifest-tool:alpine-v2.1.3 --chown=0:0 /usr/bin/docker-credential-gcloud /usr/local/bin/docker-credential-gcloud -COPY --from=mplatform/manifest-tool:alpine-v2.1.3 --chown=0:0 /usr/bin/docker-credential-ecr-login /usr/local/bin/docker-credential-ecr-login -COPY --from=mplatform/manifest-tool:alpine-v2.1.3 --chown=0:0 /usr/bin/docker-credential-acr-env /usr/local/bin/docker-credential-acr-env +COPY --from=mplatform/manifest-tool:alpine-v2.1.6 --chown=0:0 /manifest-tool /usr/local/bin/manifest-tool +COPY --from=mplatform/manifest-tool:alpine-v2.1.6 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt +COPY --from=mplatform/manifest-tool:alpine-v2.1.6 --chown=0:0 /usr/bin/docker-credential-gcloud /usr/local/bin/docker-credential-gcloud +COPY --from=mplatform/manifest-tool:alpine-v2.1.6 --chown=0:0 /usr/bin/docker-credential-ecr-login /usr/local/bin/docker-credential-ecr-login +COPY --from=mplatform/manifest-tool:alpine-v2.1.6 --chown=0:0 /usr/bin/docker-credential-acr-env /usr/local/bin/docker-credential-acr-env # install tools: k3sutil -ARG KS3UTIL_VER=2.4.2 +ARG KS3UTIL_VER=2.6.0 RUN OS=linux; ARCH=$([ "$(arch)" = "x86_64" ] && echo amd64 || echo arm64); \ wget https://ks3util-version-update.ks3-cn-beijing.ksyuncs.com/${KS3UTIL_VER}/ks3util-${OS}-${ARCH} -O /usr/local/bin/ks3util && \ chmod a+x /usr/local/bin/ks3util # install tools: tiup # renovate: datasource=github-release depName=pingcap/tiup -ARG TIUP_VER=v1.14.1 +ARG TIUP_VER=1.15.2 RUN OS=linux; ARCH=$([ "$(arch)" = "x86_64" ] && echo amd64 || echo arm64); \ - wget -q -O - https://tiup-mirrors.pingcap.com/tiup-${TIUP_VER}-${OS}-${ARCH}.tar.gz | tar -zxvf - -C /usr/local/bin && \ + wget -q -O - https://tiup-mirrors.pingcap.com/tiup-v${TIUP_VER}-${OS}-${ARCH}.tar.gz | tar -zxvf - -C /usr/local/bin && \ chmod 755 /usr/local/bin/tiup diff --git a/packages/scripts/gen-package-offline-package-with-config.sh b/packages/scripts/gen-package-offline-package-with-config.sh index 426fa3ee..82dfb1ba 100755 --- a/packages/scripts/gen-package-offline-package-with-config.sh +++ b/packages/scripts/gen-package-offline-package-with-config.sh @@ -67,7 +67,7 @@ function main() { function install_tiup_tool() { local run_os="$(uname -s)" local run_arch="$(uname -m)" - local tiup_ver="v1.14.1" + local tiup_ver="v1.15.2" local tiup_tarball case "${run_os}/${run_arch}" in