From 23105daeea7970ba7def04fd05f0ec50b8113b49 Mon Sep 17 00:00:00 2001 From: zhangl Date: Fri, 28 Oct 2022 18:45:19 +0000 Subject: [PATCH] Issue 3502 - Update anax dependencies Signed-off-by: zhangl --- go.mod | 2 +- go.sum | 2 +- test/docker/Dockerfile | 2 +- tools/arch-tag | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 3e6eb57dc..61b6a4be8 100644 --- a/go.mod +++ b/go.mod @@ -92,7 +92,7 @@ require ( replace ( github.com/containerd/containerd => github.com/containerd/containerd v1.6.6 - github.com/docker/distribution => github.com/docker/distribution v2.8.0+incompatible + github.com/docker/distribution => github.com/docker/distribution v2.8.1+incompatible github.com/opencontainers/runc => github.com/opencontainers/runc v1.1.2 golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f golang.org/x/text => golang.org/x/text v0.3.8 diff --git a/go.sum b/go.sum index c76c6523d..ae3fd9c63 100644 --- a/go.sum +++ b/go.sum @@ -177,7 +177,7 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/distribution v2.8.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.18+incompatible h1:SN84VYXTBNGn92T/QwIRPlum9zfemfitN7pbsp26WSc= github.com/docker/docker v20.10.18+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile index 854548638..871a1e5af 100755 --- a/test/docker/Dockerfile +++ b/test/docker/Dockerfile @@ -12,7 +12,7 @@ RUN curl -4fsSLO https://download.docker.com/linux/static/stable/x86_64/docker-$ && tar xzvf docker-${DOCKER_VER}.tgz --strip 1 -C /usr/bin docker/docker \ && rm docker-${DOCKER_VER}.tgz -RUN curl https://dl.google.com/go/go1.16.linux-amd64.tar.gz | tar -xzf- -C /usr/local/ +RUN curl https://dl.google.com/go/go1.19.linux-amd64.tar.gz | tar -xzf- -C /usr/local/ RUN curl -4fsSL https://apt.releases.hashicorp.com/gpg | apt-key add - && \ apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main" && \ diff --git a/tools/arch-tag b/tools/arch-tag index d1e0b4792..ef1cbdfb8 100755 --- a/tools/arch-tag +++ b/tools/arch-tag @@ -2,7 +2,7 @@ uname="$(uname -m)" -if [[ "$uname" =~ "aarch64" ]]; then +if [[ "$uname" =~ "aarch64" || "$uname" == "arm64" ]]; then echo "arm64" elif [[ "$uname" =~ "arm" ]]; then echo "armhf"