Skip to content

Update to current upstream master #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Cryptophobia merged 3 commits into from
Oct 22, 2018
Merged

Update to current upstream master #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4df9ac
feat(driver): Add support to be used as a separate storage driver
rwos Oct 10, 2018
848503f
Merge branch 'deis' of github.com:teamhephy/distribution into update-…
rwos Oct 10, 2018
8b0d548
Merge branch 'chore/merging-in-docker-master-upstream' of github.com:…
rwos Oct 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion registry/storage/blob_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"github.com/docker/distribution/registry/storage/driver/testdriver"
"github.com/docker/distribution/testutil"
"github.com/opencontainers/go-digest"
"path"
)

// TestWriteSeek tests that the current file size can be
Expand Down
4 changes: 2 additions & 2 deletions registry/storage/driver/gcs/gcs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ type driverParameters struct {
// pushes by ensuring we aren't DoSing our own server with many
// connections.
maxConcurrency uint64
projectID string
projectID string
}

func init() {
Expand Down Expand Up @@ -212,7 +212,7 @@ func FromParameters(parameters map[string]interface{}) (storagedriver.StorageDri
client: oauth2.NewClient(context.Background(), ts),
chunkSize: chunkSize,
maxConcurrency: maxConcurrency,
projectID: fmt.Sprint(key.ProjectID),
projectID: fmt.Sprint(key.ProjectID),
}

return New(params)
Expand Down
4 changes: 1 addition & 3 deletions registry/storage/driver/gcs/gcs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ import (
"os"
"testing"

dcontext "github.com/docker/distribution/context"
"fmt"

ctx "github.com/docker/distribution/context"
dcontext "github.com/docker/distribution/context"
storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/registry/storage/driver/testsuites"
"golang.org/x/oauth2"
Expand Down
2 changes: 1 addition & 1 deletion registry/storage/driver/s3-aws/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ func New(params DriverParameters) (*Driver, error) {
setv2Handlers(s3obj)
}

_, err := s3obj.CreateBucket(&s3.CreateBucketInput{
_, err = s3obj.CreateBucket(&s3.CreateBucketInput{
Bucket: &params.Bucket,
})
if err != nil {
Expand Down