Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
CSAN
Csan
Commits
bad8f026
Unverified
Commit
bad8f026
authored
Jul 16, 2020
by
Wang Yan
Committed by
GitHub
Jul 16, 2020
Browse files
upgrade golang to v1.14.5 (#12489)
Signed-off-by:
wang yan
<
wangyan@vmware.com
>
parent
d73265d1
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
119 additions
and
29 deletions
+119
-29
.github/workflows/CI.yml
.github/workflows/CI.yml
+8
-8
.github/workflows/conformance_test.yml
.github/workflows/conformance_test.yml
+2
-2
CONTRIBUTING.md
CONTRIBUTING.md
+1
-1
Makefile
Makefile
+2
-2
docs/build-customize-contribute/use-make.md
docs/build-customize-contribute/use-make.md
+2
-2
make/photon/chartserver/builder
make/photon/chartserver/builder
+1
-1
make/photon/clair-adapter/Dockerfile.binary
make/photon/clair-adapter/Dockerfile.binary
+1
-1
make/photon/clair-adapter/builder.sh
make/photon/clair-adapter/builder.sh
+1
-1
make/photon/clair/Dockerfile.binary
make/photon/clair/Dockerfile.binary
+1
-1
make/photon/clair/builder
make/photon/clair/builder
+1
-1
make/photon/notary/binary.Dockerfile
make/photon/notary/binary.Dockerfile
+1
-1
make/photon/registry/Dockerfile.binary
make/photon/registry/Dockerfile.binary
+1
-1
make/photon/trivy-adapter/Dockerfile.binary
make/photon/trivy-adapter/Dockerfile.binary
+1
-1
make/photon/trivy-adapter/builder.sh
make/photon/trivy-adapter/builder.sh
+1
-1
src/go.mod
src/go.mod
+1
-1
src/jobservice/hook/hook_client.go
src/jobservice/hook/hook_client.go
+1
-1
src/vendor/modules.txt
src/vendor/modules.txt
+90
-0
tests/ci/distro_installer.sh
tests/ci/distro_installer.sh
+2
-2
tools/swagger/Dockerfile
tools/swagger/Dockerfile
+1
-1
No files found.
.github/workflows/CI.yml
View file @
bad8f026
...
...
@@ -28,10 +28,10 @@ jobs:
#- self-hosted
-
ubuntu-latest
steps
:
-
name
:
Set up Go
1.1
3
-
name
:
Set up Go
1.1
4
uses
:
actions/setup-go@v1
with
:
go-version
:
1.1
3.8
go-version
:
1.1
4.5
id
:
go
-
name
:
setup Docker
uses
:
docker-practice/actions-setup-docker@0.0.1
...
...
@@ -93,10 +93,10 @@ jobs:
#- self-hosted
-
ubuntu-latest
steps
:
-
name
:
Set up Go
1.1
3
-
name
:
Set up Go
1.1
4
uses
:
actions/setup-go@v1
with
:
go-version
:
1.1
3.8
go-version
:
1.1
4.5
id
:
go
-
name
:
setup Docker
uses
:
docker-practice/actions-setup-docker@0.0.1
...
...
@@ -188,10 +188,10 @@ jobs:
#- self-hosted
-
ubuntu-latest
steps
:
-
name
:
Set up Go
1.1
3
-
name
:
Set up Go
1.1
4
uses
:
actions/setup-go@v1
with
:
go-version
:
1.1
3.8
go-version
:
1.1
4.5
id
:
go
-
name
:
setup Docker
uses
:
docker-practice/actions-setup-docker@0.0.1
...
...
@@ -249,10 +249,10 @@ jobs:
#- self-hosted
-
ubuntu-latest
steps
:
-
name
:
Set up Go
1.1
3
-
name
:
Set up Go
1.1
4
uses
:
actions/setup-go@v1
with
:
go-version
:
1.1
3.8
go-version
:
1.1
4.5
id
:
go
-
name
:
setup Docker
uses
:
docker-practice/actions-setup-docker@0.0.1
...
...
.github/workflows/conformance_test.yml
View file @
bad8f026
...
...
@@ -26,10 +26,10 @@ jobs:
service_account_key
:
${{ secrets.GCP_SA_KEY }}
export_default_credentials
:
true
-
run
:
gcloud info
-
name
:
Set up Go
1.1
3
-
name
:
Set up Go
1.1
4
uses
:
actions/setup-go@v1
with
:
go-version
:
1.1
3.8
go-version
:
1.1
4.5
id
:
go
-
name
:
setup Docker
uses
:
docker-practice/actions-setup-docker@0.0.1
...
...
CONTRIBUTING.md
View file @
bad8f026
...
...
@@ -138,7 +138,7 @@ Harbor backend is written in [Go](http://golang.org/). If you don't have a Harbo
| 1.8 | 1.11.2 |
| 1.9 | 1.12.12 |
| 1.10 | 1.12.12 |
| 1.11 | 1.1
3.8
|
| 1.11 | 1.1
4.5
|
Ensure your GOPATH and PATH have been configured in accordance with the Go environment instructions.
...
...
Makefile
View file @
bad8f026
...
...
@@ -9,7 +9,7 @@
# compile_golangimage:
# compile from golang image
# for example: make compile_golangimage -e GOBUILDIMAGE= \
# golang:1.1
3.8
# golang:1.1
4.5
# compile_core, compile_jobservice: compile specific binary
#
# build: build Harbor docker images from photon baseimage
...
...
@@ -150,7 +150,7 @@ GOINSTALL=$(GOCMD) install
GOTEST
=
$(GOCMD)
test
GODEP
=
$(GOTEST)
-i
GOFMT
=
gofmt
-w
GOBUILDIMAGE
=
golang:1.1
3.8
GOBUILDIMAGE
=
golang:1.1
4.5
GOBUILDPATHINCONTAINER
=
/harbor
# go build
...
...
docs/build-customize-contribute/use-make.md
View file @
bad8f026
...
...
@@ -44,13 +44,13 @@ version | set harbor version
### Build and run harbor from source code
```
sh
make
install
GOBUILDIMAGE
=
golang:1.1
3.8
COMPILETAG
=
compile_golangimage
NOTARYFLAG
=
true
make
install
GOBUILDIMAGE
=
golang:1.1
4.5
COMPILETAG
=
compile_golangimage
NOTARYFLAG
=
true
```
### Package offline installer
```
sh
make package_offline
GOBUILDIMAGE
=
golang:1.1
3.8
COMPILETAG
=
compile_golangimage
NOTARYFLAG
=
true
make package_offline
GOBUILDIMAGE
=
golang:1.1
4.5
COMPILETAG
=
compile_golangimage
NOTARYFLAG
=
true
```
### Start harbor with notary
...
...
make/photon/chartserver/builder
View file @
bad8f026
...
...
@@ -4,7 +4,7 @@ set +e
usage
(){
echo
"Usage: builder <golang image:version> <code path> <code release tag> <main.go path> <binary name>"
echo
"e.g: builder golang:1.1
3.8
github.com/helm/chartmuseum v0.12.0 cmd/chartmuseum chartm"
echo
"e.g: builder golang:1.1
4.5
github.com/helm/chartmuseum v0.12.0 cmd/chartmuseum chartm"
exit
1
}
...
...
make/photon/clair-adapter/Dockerfile.binary
View file @
bad8f026
FROM golang:1.1
3.8
FROM golang:1.1
4.5
ARG VERSION
ARG COMMIT
...
...
make/photon/clair-adapter/builder.sh
View file @
bad8f026
...
...
@@ -23,7 +23,7 @@ TEMP=$(mktemp -d ${TMPDIR-/tmp}/clair-adapter.XXXXXX)
git clone https://github.com/goharbor/harbor-scanner-clair.git
$TEMP
cd
$TEMP
;
git checkout
$VERSION
;
export
COMMIT
=
$(
git rev-list
-1
HEAD
)
;
cd
-
echo
"Building Clair adapter binary based on golang:1.1
3.8
..."
echo
"Building Clair adapter binary based on golang:1.1
4.5
..."
cp
Dockerfile.binary
$TEMP
docker build
--build-arg
VERSION
=
${
VERSION
}
--build-arg
COMMIT
=
${
COMMIT
}
-f
$TEMP
/Dockerfile.binary
-t
clair-adapter-golang
$TEMP
...
...
make/photon/clair/Dockerfile.binary
View file @
bad8f026
FROM golang:1.1
3.8
FROM golang:1.1
4.5
ADD . /go/src/github.com/quay/clair/
WORKDIR /go/src/github.com/quay/clair/
...
...
make/photon/clair/builder
View file @
bad8f026
...
...
@@ -22,7 +22,7 @@ cur=$PWD
TEMP
=
`
mktemp
-d
/
$TMPDIR
/clair.XXXXXX
`
git clone
-b
$VERSION
--single-branch
https://github.com/quay/clair.git
$TEMP
echo
'build the clair binary bases on the golang:1.1
3.8
'
echo
'build the clair binary bases on the golang:1.1
4.5
'
cp
Dockerfile.binary
$TEMP
docker build
-f
$TEMP
/Dockerfile.binary
-t
clair-golang
$TEMP
...
...
make/photon/notary/binary.Dockerfile
View file @
bad8f026
FROM
golang:1.1
3.8
FROM
golang:1.1
4.5
ARG
NOTARY_VERSION
ARG
MIGRATE_VERSION
...
...
make/photon/registry/Dockerfile.binary
View file @
bad8f026
FROM golang:1.1
3.8
FROM golang:1.1
4.5
ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution
ENV BUILDTAGS include_oss include_gcs
...
...
make/photon/trivy-adapter/Dockerfile.binary
View file @
bad8f026
FROM golang:1.1
3.8
FROM golang:1.1
4.5
ADD . /go/src/github.com/aquasecurity/harbor-scanner-trivy/
WORKDIR /go/src/github.com/aquasecurity/harbor-scanner-trivy/
...
...
make/photon/trivy-adapter/builder.sh
View file @
bad8f026
...
...
@@ -19,7 +19,7 @@ TEMP=$(mktemp -d ${TMPDIR-/tmp}/trivy-adapter.XXXXXX)
git clone https://github.com/aquasecurity/harbor-scanner-trivy.git
$TEMP
cd
$TEMP
;
git checkout
$VERSION
;
cd
-
echo
"Building Trivy adapter binary based on golang:1.1
3.8
..."
echo
"Building Trivy adapter binary based on golang:1.1
4.5
..."
cp
Dockerfile.binary
$TEMP
docker build
-f
$TEMP
/Dockerfile.binary
-t
trivy-adapter-golang
$TEMP
...
...
src/go.mod
View file @
bad8f026
module github.com/goharbor/harbor/src
go 1.1
3
go 1.1
4
require (
github.com/Azure/azure-sdk-for-go v37.2.0+incompatible // indirect
...
...
src/jobservice/hook/hook_client.go
View file @
bad8f026
...
...
@@ -59,7 +59,7 @@ func NewClient(ctx context.Context) Client {
if
commonhttp
.
InternalEnableVerifyClientCert
()
{
tlsConfig
,
err
:=
commonhttp
.
GetInternalTLSConfig
()
if
err
!=
nil
{
log
.
Errorf
(
"client load cert file with err: %
w
"
,
err
)
log
.
Errorf
(
"client load cert file with err: %
v
"
,
err
)
}
transport
.
TLSClientConfig
=
tlsConfig
}
...
...
src/vendor/modules.txt
View file @
bad8f026
# cloud.google.com/go v0.53.0
cloud.google.com/go/compute/metadata
# github.com/Azure/azure-sdk-for-go v37.2.0+incompatible
## explicit
github.com/Azure/azure-sdk-for-go/storage
github.com/Azure/azure-sdk-for-go/version
# github.com/Azure/go-autorest/autorest v0.9.3
## explicit
github.com/Azure/go-autorest/autorest
github.com/Azure/go-autorest/autorest/azure
# github.com/Azure/go-autorest/autorest/adal v0.8.0
github.com/Azure/go-autorest/autorest/adal
# github.com/Azure/go-autorest/autorest/date v0.2.0
github.com/Azure/go-autorest/autorest/date
# github.com/Azure/go-autorest/autorest/to v0.3.0
## explicit
# github.com/Azure/go-autorest/logger v0.1.0
github.com/Azure/go-autorest/logger
# github.com/Azure/go-autorest/tracing v0.5.0
...
...
@@ -19,17 +23,21 @@ github.com/BurntSushi/toml
# github.com/Knetic/govaluate v3.0.0+incompatible
github.com/Knetic/govaluate
# github.com/Masterminds/semver v1.4.2
## explicit
github.com/Masterminds/semver
# github.com/PuerkitoBio/purell v1.1.1
github.com/PuerkitoBio/purell
# github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578
github.com/PuerkitoBio/urlesc
# github.com/Unknwon/goconfig v0.0.0-20160216183935-5f601ca6ef4d
## explicit
github.com/Unknwon/goconfig
# github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412
## explicit
github.com/agl/ed25519
github.com/agl/ed25519/edwards25519
# github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190726115642-cd293c93fd97
## explicit
github.com/aliyun/alibaba-cloud-sdk-go/sdk
github.com/aliyun/alibaba-cloud-sdk-go/sdk/auth
github.com/aliyun/alibaba-cloud-sdk-go/sdk/auth/credentials
...
...
@@ -44,6 +52,7 @@ github.com/aliyun/alibaba-cloud-sdk-go/services/cr
# github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496
github.com/asaskevich/govalidator
# github.com/astaxie/beego v1.12.1
## explicit
github.com/astaxie/beego
github.com/astaxie/beego/cache
github.com/astaxie/beego/cache/redis
...
...
@@ -59,6 +68,7 @@ github.com/astaxie/beego/toolbox
github.com/astaxie/beego/utils
github.com/astaxie/beego/validation
# github.com/aws/aws-sdk-go v1.32.5
## explicit
github.com/aws/aws-sdk-go/aws
github.com/aws/aws-sdk-go/aws/arn
github.com/aws/aws-sdk-go/aws/awserr
...
...
@@ -106,12 +116,19 @@ github.com/aws/aws-sdk-go/service/s3/internal/arn
github.com/aws/aws-sdk-go/service/sts
github.com/aws/aws-sdk-go/service/sts/stsiface
# github.com/beego/i18n v0.0.0-20140604031826-e87155e8f0c0
## explicit
github.com/beego/i18n
# github.com/beorn7/perks v1.0.0
github.com/beorn7/perks/quantile
# github.com/bmatcuk/doublestar v1.1.1
## explicit
github.com/bmatcuk/doublestar
# github.com/bugsnag/bugsnag-go v1.5.2
## explicit
# github.com/bugsnag/panicwrap v1.2.0
## explicit
# github.com/casbin/casbin v1.7.0
## explicit
github.com/casbin/casbin
github.com/casbin/casbin/config
github.com/casbin/casbin/effect
...
...
@@ -122,21 +139,30 @@ github.com/casbin/casbin/persist/file-adapter
github.com/casbin/casbin/rbac
github.com/casbin/casbin/rbac/default-role-manager
github.com/casbin/casbin/util
# github.com/cenkalti/backoff v2.1.1+incompatible
## explicit
# github.com/cloudflare/cfssl v0.0.0-20190510060611-9c027c93ba9e
## explicit
# github.com/coreos/go-oidc v2.1.0+incompatible
## explicit
github.com/coreos/go-oidc
# github.com/cyphar/filepath-securejoin v0.2.2
github.com/cyphar/filepath-securejoin
# github.com/davecgh/go-spew v1.1.1
github.com/davecgh/go-spew/spew
# github.com/denverdino/aliyungo v0.0.0-20191227032621-df38c6fa730c
## explicit
github.com/denverdino/aliyungo/common
github.com/denverdino/aliyungo/oss
github.com/denverdino/aliyungo/util
# github.com/dghubble/sling v1.1.0
## explicit
github.com/dghubble/sling
# github.com/dgrijalva/jwt-go v3.2.0+incompatible
## explicit
github.com/dgrijalva/jwt-go
# github.com/docker/distribution v2.7.1+incompatible
## explicit
github.com/docker/distribution
github.com/docker/distribution/configuration
github.com/docker/distribution/context
...
...
@@ -173,28 +199,36 @@ github.com/docker/distribution/testutil
github.com/docker/distribution/uuid
github.com/docker/distribution/version
# github.com/docker/go v0.0.0-20160303222718-d30aec9fd63c
## explicit
github.com/docker/go/canonical/json
# github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82
## explicit
github.com/docker/go-metrics
# github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7
## explicit
github.com/docker/libtrust
# github.com/garyburd/redigo v1.6.0
## explicit
github.com/garyburd/redigo/internal
github.com/garyburd/redigo/redis
# github.com/ghodss/yaml v1.0.0
## explicit
github.com/ghodss/yaml
# github.com/go-openapi/analysis v0.19.5
github.com/go-openapi/analysis
github.com/go-openapi/analysis/internal
# github.com/go-openapi/errors v0.19.2
## explicit
github.com/go-openapi/errors
# github.com/go-openapi/jsonpointer v0.19.3
github.com/go-openapi/jsonpointer
# github.com/go-openapi/jsonreference v0.19.3
github.com/go-openapi/jsonreference
# github.com/go-openapi/loads v0.19.4
## explicit
github.com/go-openapi/loads
# github.com/go-openapi/runtime v0.19.5
## explicit
github.com/go-openapi/runtime
github.com/go-openapi/runtime/logger
github.com/go-openapi/runtime/middleware
...
...
@@ -203,14 +237,19 @@ github.com/go-openapi/runtime/middleware/header
github.com/go-openapi/runtime/middleware/untyped
github.com/go-openapi/runtime/security
# github.com/go-openapi/spec v0.19.3
## explicit
github.com/go-openapi/spec
# github.com/go-openapi/strfmt v0.19.3
## explicit
github.com/go-openapi/strfmt
# github.com/go-openapi/swag v0.19.5
## explicit
github.com/go-openapi/swag
# github.com/go-openapi/validate v0.19.5
## explicit
github.com/go-openapi/validate
# github.com/go-sql-driver/mysql v1.5.0
## explicit
github.com/go-sql-driver/mysql
# github.com/go-stack/stack v1.8.0
github.com/go-stack/stack
...
...
@@ -224,11 +263,15 @@ github.com/gobwas/glob/syntax/lexer
github.com/gobwas/glob/util/runes
github.com/gobwas/glob/util/strings
# github.com/gocraft/work v0.5.1
## explicit
github.com/gocraft/work
# github.com/gofrs/uuid v3.2.0+incompatible
## explicit
# github.com/gogo/protobuf v1.3.1
github.com/gogo/protobuf/proto
github.com/gogo/protobuf/sortkeys
# github.com/golang-migrate/migrate/v4 v4.11.0
## explicit
github.com/golang-migrate/migrate/v4
github.com/golang-migrate/migrate/v4/database
github.com/golang-migrate/migrate/v4/database/postgres
...
...
@@ -243,28 +286,38 @@ github.com/golang/protobuf/ptypes/any
github.com/golang/protobuf/ptypes/duration
github.com/golang/protobuf/ptypes/timestamp
# github.com/gomodule/redigo v2.0.0+incompatible
## explicit
github.com/gomodule/redigo/internal
github.com/gomodule/redigo/redis
# github.com/google/certificate-transparency-go v1.0.21
## explicit
# github.com/google/go-querystring v1.0.0
github.com/google/go-querystring/query
# github.com/google/gofuzz v1.0.0
github.com/google/gofuzz
# github.com/google/uuid v1.1.1
## explicit
github.com/google/uuid
# github.com/gorilla/csrf v1.6.2
## explicit
github.com/gorilla/csrf
# github.com/gorilla/handlers v1.4.2
## explicit
github.com/gorilla/handlers
# github.com/gorilla/mux v1.7.4
## explicit
github.com/gorilla/mux
# github.com/gorilla/securecookie v1.1.1
github.com/gorilla/securecookie
# github.com/graph-gophers/dataloader v5.0.0+incompatible
## explicit
github.com/graph-gophers/dataloader
# github.com/hashicorp/errwrap v1.0.0
github.com/hashicorp/errwrap
# github.com/hashicorp/go-multierror v1.1.0
github.com/hashicorp/go-multierror
# github.com/jinzhu/gorm v1.9.8
## explicit
# github.com/jmespath/go-jmespath v0.3.0
github.com/jmespath/go-jmespath
# github.com/json-iterator/go v1.1.8
...
...
@@ -272,6 +325,7 @@ github.com/json-iterator/go
# github.com/konsorten/go-windows-terminal-sequences v1.0.2
github.com/konsorten/go-windows-terminal-sequences
# github.com/lib/pq v1.3.0
## explicit
github.com/lib/pq
github.com/lib/pq/oid
github.com/lib/pq/scram
...
...
@@ -280,10 +334,12 @@ github.com/mailru/easyjson/buffer
github.com/mailru/easyjson/jlexer
github.com/mailru/easyjson/jwriter
# github.com/mattn/go-runewidth v0.0.4
## explicit
github.com/mattn/go-runewidth
# github.com/matttproud/golang_protobuf_extensions v1.0.1
github.com/matttproud/golang_protobuf_extensions/pbutil
# github.com/miekg/pkcs11 v0.0.0-20170220202408-7283ca79f35e
## explicit
github.com/miekg/pkcs11
# github.com/mitchellh/mapstructure v1.1.2
github.com/mitchellh/mapstructure
...
...
@@ -292,22 +348,29 @@ github.com/modern-go/concurrent
# github.com/modern-go/reflect2 v1.0.1
github.com/modern-go/reflect2
# github.com/ncw/swift v1.0.49
## explicit
github.com/ncw/swift
# github.com/olekukonko/tablewriter v0.0.1
## explicit
github.com/olekukonko/tablewriter
# github.com/opencontainers/go-digest v1.0.0-rc1
## explicit
github.com/opencontainers/go-digest
# github.com/opencontainers/image-spec v1.0.1
## explicit
github.com/opencontainers/image-spec/specs-go
github.com/opencontainers/image-spec/specs-go/v1
# github.com/opentracing/opentracing-go v1.1.0
## explicit
github.com/opentracing/opentracing-go
github.com/opentracing/opentracing-go/log
# github.com/pkg/errors v0.9.1
## explicit
github.com/pkg/errors
# github.com/pmezard/go-difflib v1.0.0
github.com/pmezard/go-difflib/difflib
# github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35
## explicit
github.com/pquerna/cachecontrol
github.com/pquerna/cachecontrol/cacheobject
# github.com/prometheus/client_golang v1.0.0
...
...
@@ -325,23 +388,29 @@ github.com/prometheus/procfs
github.com/prometheus/procfs/internal/fs
github.com/prometheus/procfs/internal/util
# github.com/robfig/cron v1.0.0
## explicit
github.com/robfig/cron
# github.com/satori/go.uuid v1.2.0
github.com/satori/go.uuid
# github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644
## explicit
github.com/shiena/ansicolor
# github.com/sirupsen/logrus v1.4.2
github.com/sirupsen/logrus
# github.com/spf13/pflag v1.0.5
github.com/spf13/pflag
# github.com/spf13/viper v1.4.0
## explicit
# github.com/stretchr/objx v0.2.0
github.com/stretchr/objx
# github.com/stretchr/testify v1.5.1
## explicit
github.com/stretchr/testify/assert
github.com/stretchr/testify/mock
github.com/stretchr/testify/require
github.com/stretchr/testify/suite
# github.com/theupdateframework/notary v0.6.1
## explicit
github.com/theupdateframework/notary
github.com/theupdateframework/notary/client
github.com/theupdateframework/notary/client/changelist
...
...
@@ -363,6 +432,7 @@ go.mongodb.org/mongo-driver/bson/bsontype
go.mongodb.org/mongo-driver/bson/primitive
go.mongodb.org/mongo-driver/x/bsonx/bsoncore
# golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073
## explicit
golang.org/x/crypto/acme
golang.org/x/crypto/acme/autocert
golang.org/x/crypto/cast5
...
...
@@ -378,6 +448,7 @@ golang.org/x/crypto/openpgp/s2k
golang.org/x/crypto/pbkdf2
golang.org/x/crypto/ssh/terminal
# golang.org/x/net v0.0.0-20200202094626-16171245cfb2
## explicit
golang.org/x/net/context
golang.org/x/net/context/ctxhttp
golang.org/x/net/http/httpguts
...
...
@@ -387,6 +458,7 @@ golang.org/x/net/idna
golang.org/x/net/internal/timeseries
golang.org/x/net/trace
# golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
## explicit
golang.org/x/oauth2
golang.org/x/oauth2/clientcredentials
golang.org/x/oauth2/google
...
...
@@ -465,25 +537,37 @@ google.golang.org/grpc/stats
google.golang.org/grpc/status
google.golang.org/grpc/tap
# gopkg.in/asn1-ber.v1 v1.0.0-20150924051756-4e86f4367175
## explicit
gopkg.in/asn1-ber.v1
# gopkg.in/dancannon/gorethink.v3 v3.0.5
## explicit
# gopkg.in/fatih/pool.v2 v2.0.0
## explicit
# gopkg.in/gorethink/gorethink.v3 v3.0.5
## explicit
# gopkg.in/inf.v0 v0.9.1
gopkg.in/inf.v0
# gopkg.in/ini.v1 v1.42.0
gopkg.in/ini.v1
# gopkg.in/ldap.v2 v2.5.0
## explicit
gopkg.in/ldap.v2
# gopkg.in/square/go-jose.v2 v2.3.0
## explicit
gopkg.in/square/go-jose.v2
gopkg.in/square/go-jose.v2/cipher
gopkg.in/square/go-jose.v2/json
# gopkg.in/yaml.v2 v2.2.8
## explicit
gopkg.in/yaml.v2
# helm.sh/helm/v3 v3.1.1
## explicit
helm.sh/helm/v3/internal/ignore
helm.sh/helm/v3/internal/sympath
helm.sh/helm/v3/pkg/chart
helm.sh/helm/v3/pkg/chart/loader
# k8s.io/api v0.17.3
## explicit
k8s.io/api/admissionregistration/v1
k8s.io/api/admissionregistration/v1beta1
k8s.io/api/apps/v1
...
...
@@ -525,6 +609,7 @@ k8s.io/api/storage/v1
k8s.io/api/storage/v1alpha1
k8s.io/api/storage/v1beta1
# k8s.io/apimachinery v0.17.3
## explicit
k8s.io/apimachinery/pkg/api/errors
k8s.io/apimachinery/pkg/api/resource
k8s.io/apimachinery/pkg/apis/meta/v1
...
...
@@ -559,6 +644,7 @@ k8s.io/apimachinery/pkg/version
k8s.io/apimachinery/pkg/watch
k8s.io/apimachinery/third_party/forked/golang/reflect
# k8s.io/client-go v0.17.3
## explicit
k8s.io/client-go/kubernetes/scheme
k8s.io/client-go/pkg/apis/clientauthentication
k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1
...
...
@@ -576,6 +662,7 @@ k8s.io/client-go/util/flowcontrol
k8s.io/client-go/util/homedir
k8s.io/client-go/util/keyutil
# k8s.io/helm v2.16.3+incompatible
## explicit
k8s.io/helm/cmd/helm/search
k8s.io/helm/pkg/chartutil
k8s.io/helm/pkg/getter
...
...
@@ -597,3 +684,6 @@ k8s.io/klog
k8s.io/utils/integer
# sigs.k8s.io/yaml v1.1.0
sigs.k8s.io/yaml
# github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.3+incompatible
# github.com/goharbor/harbor => ../
# google.golang.org/api => google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff
tests/ci/distro_installer.sh
View file @
bad8f026
...
...
@@ -3,5 +3,5 @@ set -x
set
-e
sudo
make package_online
GOBUILDTAGS
=
"include_oss include_gcs"
VERSIONTAG
=
dev-travis
PKGVERSIONTAG
=
dev-travis
UIVERSIONTAG
=
dev-travis
GOBUILDIMAGE
=
golang:1.1
3.8
COMPILETAG
=
compile_golangimage
NOTARYFLAG
=
true
CLAIRFLAG
=
true
CHARTFLAG
=
true
TRIVYFLAG
=
true
HTTPPROXY
=
sudo
make package_offline
GOBUILDTAGS
=
"include_oss include_gcs"
VERSIONTAG
=
dev-travis
PKGVERSIONTAG
=
dev-travis
UIVERSIONTAG
=
dev-travis
GOBUILDIMAGE
=
golang:1.1
3.8
COMPILETAG
=
compile_golangimage
NOTARYFLAG
=
true
CLAIRFLAG
=
true
CHARTFLAG
=
true
TRIVYFLAG
=
true
HTTPPROXY
=
sudo
make package_online
GOBUILDTAGS
=
"include_oss include_gcs"
VERSIONTAG
=
dev-travis
PKGVERSIONTAG
=
dev-travis
UIVERSIONTAG
=
dev-travis
GOBUILDIMAGE
=
golang:1.1
4.5
COMPILETAG
=
compile_golangimage
NOTARYFLAG
=
true
CLAIRFLAG
=
true
CHARTFLAG
=
true
TRIVYFLAG
=
true
HTTPPROXY
=
sudo
make package_offline
GOBUILDTAGS
=
"include_oss include_gcs"
VERSIONTAG
=
dev-travis
PKGVERSIONTAG
=
dev-travis
UIVERSIONTAG
=
dev-travis
GOBUILDIMAGE
=
golang:1.1
4.5
COMPILETAG
=
compile_golangimage
NOTARYFLAG
=
true
CLAIRFLAG
=
true
CHARTFLAG
=
true
TRIVYFLAG
=
true
HTTPPROXY
=
tools/swagger/Dockerfile
View file @
bad8f026
FROM
golang:1.1
3.8
FROM
golang:1.1
4.5
ARG
SWAGGER_VERSION
RUN
curl
-fsSL
-o
/usr/bin/swagger https://github.com/go-swagger/go-swagger/releases/download/
$SWAGGER_VERSION
/swagger_linux_amd64
&&
chmod
+x /usr/bin/swagger
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment