Skip to content

chore(deps): Move to go modules; Upgrade distribution to latest version. #2

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 2 commits into from
Jun 25, 2020
Merged

chore(deps): Move to go modules; Upgrade distribution to latest version. #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b069c6f
chore(deps): Move to go modules; Upgrade distribution to latest version.
Jun 19, 2020
9ff170f
Use hephy base image
Jun 25, 2020
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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ else
GOOS=linux
endif

DEV_ENV_IMAGE := quay.io/deis/go-dev:0.11.1
DEV_ENV_IMAGE := quay.io/deis/go-dev:v1.27.1
Copy link
Copy Markdown
Member

@Cryptophobia Cryptophobia Jun 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you change to use our own image here:

hephy/go-dev:v1.26.2

We are building it from here and merging upstream changes: https://github.com/teamhephy/docker-go-dev

Copy link
Copy Markdown
Author

@jfuechsl jfuechsl Jun 25, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pushed the change.

Copy link
Copy Markdown
Member

@Cryptophobia Cryptophobia Jun 25, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for making this fix to use our own images @jfuechsl!

DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
DEV_ENV_PREFIX := docker run --rm -e GO15VENDOREXPERIMENT=1 -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
Expand Down Expand Up @@ -40,4 +40,4 @@ binary-build:
dist: build-all

test:
${DEV_ENV_CMD} go test $$(glide nv)
${DEV_ENV_CMD} go test ./...
131 changes: 0 additions & 131 deletions glide.lock
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions glide.yaml
View file
Open in desktop

This file was deleted.

29 changes: 29 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
module object-storage-cli

go 1.14

require (
github.com/Azure/azure-sdk-for-go v16.2.1+incompatible // indirect
github.com/Sirupsen/logrus v0.7.3 // indirect
github.com/arschles/assert v0.0.0-20160218172821-d21ecd4884be
github.com/aws/aws-sdk-go v1.15.11 // indirect
github.com/codegangsta/cli v1.13.1-0.20160326223947-bc465becccd1
github.com/deis/object-storage-cli v0.0.0-20180301165133-c4ae08b0bf39
github.com/docker/distribution v0.0.0-00010101000000-000000000000
github.com/go-ini/ini v1.25.4 // indirect
github.com/golang/protobuf v1.3.2 // indirect
github.com/gorilla/context v0.0.0-20140604161150-14f550f51af5 // indirect
github.com/gorilla/mux v1.7.2 // indirect
github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7 // indirect
github.com/kelseyhightower/envconfig v1.1.1-0.20160316193706-cea086319492
github.com/mitchellh/mapstructure v1.1.2 // indirect
github.com/ncw/swift v1.0.47 // indirect
golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b // indirect
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff // indirect
google.golang.org/appengine v1.4.0 // indirect
google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8 // indirect
google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a // indirect
)

replace github.com/docker/distribution => github.com/teamhephy/distribution v0.0.0-20200427164433-c77f65b80cb8
Loading