Merge pull request #3536 from LiilyZhang/zhangl/updateDep2.29

Issue 3502 - Update anax dependencies

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

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=

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" && \

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"