Skip to content

Commit

Permalink
Merge pull request #12 from rancher/use-docker-sdk
Browse files Browse the repository at this point in the history
Replace docker commands with docker sdk
  • Loading branch information
iwilltry42 authored Apr 26, 2019
2 parents e35716b + 068172a commit 705ef69
Show file tree
Hide file tree
Showing 12 changed files with 622 additions and 181 deletions.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,16 @@ ifeq ($(GIT_TAG),)
GIT_TAG := $(shell git describe --always)
endif

# get latest k3s version
K3S_TAG := $(shell curl --silent "https://api.github.com/repos/rancher/k3s/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')

# Go options
GO ?= go
PKG := $(shell go mod vendor)
TAGS :=
TESTS := .
TESTFLAGS :=
LDFLAGS := -w -s -X github.com/rancher/k3d/version.Version=${GIT_TAG}
LDFLAGS := -w -s -X github.com/rancher/k3d/version.Version=${GIT_TAG} -X github.com/rancher/k3d/version.K3sVersion=${K3S_TAG}
GOFLAGS :=
BINDIR := $(CURDIR)/bin
BINARIES := k3d
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ Example Workflow: Create a new cluster and use it with `kubectl`

## TODO

- [ ] Use the docker client library instead of commands
- [ ] Test the docker version
- [ ] Improve cluster state management
- [x] Use the docker client library instead of commands
- [x] Improve cluster state management
- [x] Add install script
- [ ] Use [sirupsen/logrus](https://github.com/sirupsen/logrus) for prettier logs
- [ ] Add install script
Loading

0 comments on commit 705ef69

Please sign in to comment.