Skip to content

Commit

Permalink
Migrate to Go 1.14 (#247)
Browse files Browse the repository at this point in the history
* Upgrade to go 1.14

* Migrate to go 1.14

* Fix authenticator
  • Loading branch information
Yiran Wang authored May 5, 2020
1 parent e8b9a9f commit e95dce8
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 477 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@ sudo: required
language: go

go:
- 1.12.x
- 1.14.x

services:
- docker

env:
- PATH=$HOME/protoc/bin:$PATH
- GO111MODULE=on

before_script:
- "curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | sudo bash"
Expand All @@ -27,7 +26,7 @@ jobs:
- stage: Compliance
name: Fossa Check
script:
- "GO111MODULE=on fossa --option allow-unresolved:true"
- "fossa --option allow-unresolved:true"

after_success:
- bash <(curl -s https://codecov.io/bash)
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
export GO111MODULE = on

SHELL = /bin/bash -o pipefail
GO = go

Expand All @@ -25,7 +23,7 @@ BUILD_LINUX = GOOS=linux GOARCH=amd64 $(GO) build -i -o $@ $(BUILD_FLAGS) $(BUIL

# Cross compiling cgo for sqlite3 is not well supported in Mac OSX.
# This workaround builds the binary inside a linux container.
CROSS_COMPILER = docker run --rm -it -v $(shell go env GOPATH):/go -e GO111MODULE=on -w /go/src/github.com/uber/kraken golang:1.11.4 go build -o ./$@ ./$(dir $@)
CROSS_COMPILER = docker run --rm -it -v $(shell pwd):/go/src/github.com/uber/kraken -w /go/src/github.com/uber/kraken golang:1.14 go build -o ./$@ ./$(dir $@)

LINUX_BINS = \
agent/agent \
Expand Down
4 changes: 2 additions & 2 deletions examples/devcluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

`$ make devcluster`

This command creates a `kraken-agent` image containing an agent binary and a `kraken-herd` image containing build-index, origin, proxy, and tracker binaries.
This command creates a `kraken-agent` image containing an agent binary and a `kraken-herd` image containing build-index, origin, proxy, and tracker binaries.

It starts 2 agent docker containers and 1 herd container. Docker-for-Mac is required for devcluster to work, because the development config files use host.docker.internal for address of all components.

## 2. Pulling from Docker Hub Library

A simple registry storage backend is provided for read-only access to Docker registry. A library image can be pulled from agent.

`$ docker pull localhost:16000/library/golang:1.11`
`$ docker pull localhost:16000/library/golang:1.14`

Note, this backend is used for all `library/.*` repositories. `library` is the default namespace for Docker Hub's standard public repositories.

Expand Down
Loading

0 comments on commit e95dce8

Please sign in to comment.