Upgrade to containerd 1.3.2, prep 0.8.1 release (oras-project#146)

* Upgrade to containerd 1.3.1, prep 0.8.1 release Signed-off-by: Josh Dolitsky <[email protected]> * Upgrade to containerd 1.3.2, depends updates Signed-off-by: Josh Dolitsky <[email protected]> * add replace for docker ditstribution Signed-off-by: Josh Dolitsky <[email protected]> * remove revision 000000000000 Signed-off-by: Josh Dolitsky <[email protected]> * remove revision 000000000000 (for docker/docker) Signed-off-by: Josh Dolitsky <[email protected]> * lock autorest Signed-off-by: Josh Dolitsky <[email protected]>
whalecold · Feb 3, 2020 · 237ac92 · 237ac92
1 parent 93c4cc2
commit 237ac92
Show file tree

Hide file tree

Showing 4 changed files with 170 additions and 66 deletions.
diff --git a/README.md b/README.md
@@ -43,38 +43,38 @@ ORAS is both a [CLI](#oras-cli) for initial testing and a [Go Module](#oras-go-m
   ```sh
   gofish install oras
   ==> Installing oras...
-  🐠  oras 0.7.0: installed in 65.131245ms
+  🐠  oras 0.8.1: installed in 65.131245ms
   ```
 
 - Install from the latest [release artifacts](https://github.com/deislabs/oras/releases):
 
   - Linux
 
     ```sh
-    curl -LO https://github.com/deislabs/oras/releases/download/v0.7.0/oras_0.7.0_linux_amd64.tar.gz
+    curl -LO https://github.com/deislabs/oras/releases/download/v0.8.1/oras_0.8.1_linux_amd64.tar.gz
     mkdir -p oras-install/
-    tar -zxf oras_0.7.0_*.tar.gz -C oras-install/
+    tar -zxf oras_0.8.1_*.tar.gz -C oras-install/
     mv oras-install/oras /usr/local/bin/
-    rm -rf oras_0.7.0_*.tar.gz oras-install/
+    rm -rf oras_0.8.1_*.tar.gz oras-install/
     ```
 
   - macOS
 
     ```sh
-    curl -LO https://github.com/deislabs/oras/releases/download/v0.7.0/oras_0.7.0_darwin_amd64.tar.gz
+    curl -LO https://github.com/deislabs/oras/releases/download/v0.8.1/oras_0.8.1_darwin_amd64.tar.gz
     mkdir -p oras-install/
-    tar -zxf oras_0.7.0_*.tar.gz -C oras-install/
+    tar -zxf oras_0.8.1_*.tar.gz -C oras-install/
     mv oras-install/oras /usr/local/bin/
-    rm -rf oras_0.7.0_*.tar.gz oras-install/
+    rm -rf oras_0.8.1_*.tar.gz oras-install/
     ```
 
   - Windows
 
     Add `%USERPROFILE%\bin\` to your `PATH` environment variable so that `oras.exe` can be found.
 
     ```sh
-    curl.exe -sLO  https://github.com/deislabs/oras/releases/download/v0.7.0/oras_0.7.0_windows_amd64.tar.gz
-    tar.exe -xvzf oras_0.7.0_windows_amd64.tar.gz
+    curl.exe -sLO  https://github.com/deislabs/oras/releases/download/v0.8.1/oras_0.8.1_windows_amd64.tar.gz
+    tar.exe -xvzf oras_0.8.1_windows_amd64.tar.gz
     mkdir -p %USERPROFILE%\bin\
     copy oras.exe %USERPROFILE%\bin\
     set PATH=%USERPROFILE%\bin\;%PATH%
@@ -85,7 +85,7 @@ ORAS is both a [CLI](#oras-cli) for initial testing and a [Go Module](#oras-go-m
     A public Docker image containing the CLI is available on [Docker Hub](https://hub.docker.com/r/orasbot/oras):
 
     ```sh
-    docker run -it --rm -v $(pwd):/workspace orasbot/oras:v0.7.0 help
+    docker run -it --rm -v $(pwd):/workspace orasbot/oras:v0.8.1 help
     ```
 
     > Note: the default WORKDIR  in the image is `/workspace`.

diff --git a/go.mod b/go.mod
@@ -2,31 +2,35 @@ module github.com/deislabs/oras
 
 go 1.13
 
+replace (
+	github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible
+	github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.4.2
+	github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
+	github.com/docker/docker => github.com/moby/moby v1.4.2-0.20200203170920-46ec8731fbce
+)
+
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
-	github.com/Microsoft/go-winio v0.4.14 // indirect
-	github.com/Microsoft/hcsshim v0.8.6 // indirect
-	github.com/containerd/containerd v1.3.0
-	github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6 // indirect
-	github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017
-	github.com/docker/distribution v0.0.0-20191008191456-ae2e973db936
-	github.com/docker/docker v0.7.3-0.20190826074503-38ab9da00309
+	github.com/Microsoft/hcsshim v0.8.7 // indirect
+	github.com/containerd/containerd v1.3.2
+	github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41 // indirect
+	github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492
+	github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
+	github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce
 	github.com/docker/docker-credential-helpers v0.6.3 // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
-	github.com/docker/go-units v0.4.0 // indirect
 	github.com/gogo/protobuf v1.3.1 // indirect
-	github.com/google/go-cmp v0.3.1 // indirect
+	github.com/google/go-cmp v0.4.0 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0-rc1
-	github.com/opencontainers/image-spec v1.0.0
+	github.com/opencontainers/image-spec v1.0.1
 	github.com/opencontainers/runc v0.1.1 // indirect
 	github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
-	github.com/pkg/errors v0.8.1
+	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.4.2
-	github.com/spf13/cobra v0.0.3
-	github.com/stretchr/testify v1.3.0
-	golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
-	golang.org/x/sync v0.0.0-20190423024810-112230192c58
-	google.golang.org/grpc v1.24.0 // indirect
-	gotest.tools v2.2.0+incompatible // indirect
+	github.com/spf13/cobra v0.0.5
+	github.com/stretchr/testify v1.4.0
+	golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d
+	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
+	google.golang.org/grpc v1.27.0 // indirect
 )