Skip to content

Commit 5229f7a

Browse files
jpreesejdolitsky
authored andcommitted
Update oras modules and pipelines (#135)
* Update module file for 1.13 * Update pipelines to use 1.13 * Update dependencies
1 parent eda7eb2 commit 5229f7a

File tree

6 files changed

+131
-163
lines changed

6 files changed

+131
-163
lines changed

.codefresh/master.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ steps:
88
UnitTest:
99
title: Run unit tests
1010
stage: test
11-
image: golang:1.11-alpine
11+
image: golang:1.13-alpine
1212
commands:
1313
- apk add git make bash file
1414
- cf_export GOCACHE="${{CF_VOLUME_PATH}}/gocache"
@@ -27,3 +27,4 @@ steps:
2727
candidate: ${{BuildDockerImage}}
2828
image_name: orasbot/${{CF_REPO_NAME}}
2929
registry: dockerhub
30+

.codefresh/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ steps:
55
UnitTest:
66
title: Run unit tests
77
stage: test
8-
image: golang:1.11-alpine
8+
image: golang:1.13-alpine
99
commands:
1010
- apk add git make bash file
1111
- make test

.codefresh/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ steps:
88
UnitTest:
99
title: Run unit tests
1010
stage: test
11-
image: golang:1.11-alpine
11+
image: golang:1.13-alpine
1212
commands:
1313
- apk add git make bash file
1414
- make test

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.11-alpine as builder
1+
FROM golang:1.13-alpine as builder
22
RUN apk add git make
33
ENV ORASPKG /oras
44
ADD . ${ORASPKG}

go.mod

Lines changed: 17 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,32 @@
11
module github.com/deislabs/oras
22

3+
go 1.13
4+
35
require (
46
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
5-
github.com/Microsoft/go-winio v0.4.11 // indirect
7+
github.com/Microsoft/go-winio v0.4.14 // indirect
68
github.com/Microsoft/hcsshim v0.8.6 // indirect
7-
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
8-
github.com/bitly/go-simplejson v0.5.0 // indirect
9-
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
10-
github.com/bshuster-repo/logrus-logstash-hook v0.4.1 // indirect
11-
github.com/bugsnag/bugsnag-go v1.5.0 // indirect
12-
github.com/bugsnag/panicwrap v1.2.0 // indirect
13-
github.com/containerd/containerd v1.3.0-beta.2.0.20190823190603-4a2f61c4f2b4
14-
github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 // indirect
15-
github.com/docker/cli v0.0.0-20190506213505-d88565df0c2d
16-
github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible
17-
github.com/docker/docker v0.0.0-00010101000000-000000000000
18-
github.com/docker/docker-credential-helpers v0.6.1 // indirect
9+
github.com/containerd/containerd v1.3.0
10+
github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6 // indirect
11+
github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017
12+
github.com/docker/distribution v0.0.0-20191008191456-ae2e973db936
13+
github.com/docker/docker v0.7.3-0.20190826074503-38ab9da00309
14+
github.com/docker/docker-credential-helpers v0.6.3 // indirect
1915
github.com/docker/go-connections v0.4.0 // indirect
20-
github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82 // indirect
21-
github.com/docker/go-units v0.3.3 // indirect
22-
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
23-
github.com/garyburd/redigo v1.6.0 // indirect
24-
github.com/gofrs/uuid v3.2.0+incompatible // indirect
25-
github.com/gogo/protobuf v1.2.1 // indirect
26-
github.com/google/go-cmp v0.3.0 // indirect
27-
github.com/gorilla/handlers v1.4.0 // indirect
28-
github.com/gorilla/mux v1.7.0 // indirect
29-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
30-
github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 // indirect
31-
github.com/kr/pretty v0.1.0 // indirect
32-
github.com/miekg/dns v0.0.0-20181005163659-0d29b283ac0f // indirect
33-
github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c // indirect
16+
github.com/docker/go-units v0.4.0 // indirect
17+
github.com/gogo/protobuf v1.3.1 // indirect
18+
github.com/google/go-cmp v0.3.1 // indirect
19+
github.com/morikuni/aec v1.0.0 // indirect
3420
github.com/opencontainers/go-digest v1.0.0-rc1
35-
github.com/opencontainers/image-spec v1.0.1
21+
github.com/opencontainers/image-spec v1.0.0
3622
github.com/opencontainers/runc v0.1.1 // indirect
37-
github.com/phayes/freeport v0.0.0-20171002181615-b8543db493a5
23+
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
3824
github.com/pkg/errors v0.8.1
39-
github.com/prometheus/client_golang v0.9.2 // indirect
40-
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 // indirect
41-
github.com/prometheus/common v0.2.0 // indirect
42-
github.com/prometheus/procfs v0.0.0-20190129233650-316cf8ccfec5 // indirect
4325
github.com/sirupsen/logrus v1.4.2
4426
github.com/spf13/cobra v0.0.3
45-
github.com/spf13/pflag v1.0.3 // indirect
4627
github.com/stretchr/testify v1.3.0
47-
github.com/xenolf/lego v0.0.0-20160613233155-a9d8cec0e656 // indirect
48-
github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect
49-
github.com/yvasiyarov/gorelic v0.0.6 // indirect
50-
github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f // indirect
5128
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
52-
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4
53-
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect
54-
google.golang.org/genproto v0.0.0-20190128161407-8ac453e89fca // indirect
55-
google.golang.org/grpc v1.20.1 // indirect
56-
gopkg.in/square/go-jose.v1 v1.1.2 // indirect
57-
gopkg.in/yaml.v2 v2.2.2 // indirect
29+
golang.org/x/sync v0.0.0-20190423024810-112230192c58
30+
google.golang.org/grpc v1.24.0 // indirect
5831
gotest.tools v2.2.0+incompatible // indirect
59-
rsc.io/letsencrypt v0.0.1 // indirect
60-
)
61-
62-
replace (
63-
github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309
64-
rsc.io/letsencrypt => github.com/dmcgowan/letsencrypt v0.0.0-20160928181947-1847a81d2087
6532
)

0 commit comments

Comments
 (0)