From 31eb200a9e8fdb373330eb5218385f52b2e5be1c Mon Sep 17 00:00:00 2001 From: Praveen Kumar Date: Wed, 1 May 2019 17:07:37 +0530 Subject: [PATCH 1/2] Update Makefile and respective Dockerfile - Add code-ready/machine as part of dep in module --- Dockerfile.centos7 | 6 +----- Dockerfile.ubuntu16.04 | 6 +----- Makefile | 24 ++++++++++++------------ go.mod | 5 ++++- go.sum | 21 +++++++++++++++++++++ 5 files changed, 39 insertions(+), 23 deletions(-) diff --git a/Dockerfile.centos7 b/Dockerfile.centos7 index d1c5da66..5d10d9fc 100644 --- a/Dockerfile.centos7 +++ b/Dockerfile.centos7 @@ -2,17 +2,13 @@ FROM centos:7 MAINTAINER CodeReady Containers -ARG MACHINE_VERSION ARG GO_VERSION -ENV GOPATH /go RUN yum install -y libvirt-devel curl git gcc RUN curl -sSL https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz | tar -C /usr/local -xzf - ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin:/go/bin -RUN git clone --branch ${MACHINE_VERSION} https://github.com/code-ready/machine.git /go/src/github.com/code-ready/machine COPY . /go/src/github.com/code-ready/machine-driver-libvirt WORKDIR /go/src/github.com/code-ready/machine-driver-libvirt -RUN go get -v -d ./... -RUN go install -v ./cmd/machine-driver-libvirt +RUN go build -i -v -o /go/bin/crc-driver-libvirt ./cmd/machine-driver-libvirt diff --git a/Dockerfile.ubuntu16.04 b/Dockerfile.ubuntu16.04 index b2baf8d5..e411d6ee 100644 --- a/Dockerfile.ubuntu16.04 +++ b/Dockerfile.ubuntu16.04 @@ -2,17 +2,13 @@ FROM ubuntu:16.04 MAINTAINER CodeReady Containers -ARG MACHINE_VERSION ARG GO_VERSION -ENV GOPATH /go RUN apt-get update && apt-get install -y libvirt-dev curl git gcc RUN curl -sSL https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz | tar -C /usr/local -xzf - ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin:/go/bin -RUN git clone --branch ${MACHINE_VERSION} https://github.com/code-ready/machine.git /go/src/github.com/code-ready/machine COPY . /go/src/github.com/code-ready/machine-driver-libvirt WORKDIR /go/src/github.com/code-ready/machine-driver-libvirt -RUN go get -v -d ./... -RUN go install -v ./cmd/machine-driver-libvirt +RUN go build -i -v -o /go/bin/crc-driver-libvirt ./cmd/machine-driver-libvirt diff --git a/Makefile b/Makefile index c8607a5d..8c3abd0f 100644 --- a/Makefile +++ b/Makefile @@ -1,37 +1,37 @@ -PREFIX=docker-machine-driver-kvm -MACHINE_VERSION=v0.10.0 -GO_VERSION=1.8.1 +PREFIX=/go +CMD=crc-driver-libvirt +GO_VERSION=1.11.6 DESCRIBE=$(shell git describe --tags) -TARGETS=$(addprefix $(PREFIX)-, centos7 ubuntu16.04) +TARGETS=$(addprefix $(CMD)-, centos7 ubuntu16.04) build: $(TARGETS) -$(PREFIX)-%: Dockerfile.% +$(CMD)-%: Dockerfile.% docker rmi -f $@ >/dev/null 2>&1 || true docker rm -f $@-extract > /dev/null 2>&1 || true echo "Building binaries for $@" - docker build --build-arg "MACHINE_VERSION=$(MACHINE_VERSION)" --build-arg "GO_VERSION=$(GO_VERSION)" -t $@ -f $< . + docker build --build-arg "GO_VERSION=$(GO_VERSION)" -t $@ -f $< . docker create --name $@-extract $@ sh - docker cp $@-extract:/go/bin/docker-machine-driver-kvm ./ - mv ./docker-machine-driver-kvm ./$@ + docker cp $@-extract:$(PREFIX)/bin/$(CMD) ./ + mv ./$(CMD) ./$@ docker rm $@-extract || true docker rmi $@ || true clean: - rm -f ./$(PREFIX)-* + rm -f ./$(CMD)-* release: build @echo "Paste the following into the release page on github and upload the binaries..." @echo "" - @for bin in $(PREFIX)-* ; do \ + @for bin in $(CMD)-* ; do \ target=$$(echo $${bin} | cut -f5- -d-) ; \ md5=$$(md5sum $${bin}) ; \ echo "* $${target} - md5: $${md5}" ; \ echo '```' ; \ - echo " curl -L https://github.com/dhiltgen/docker-machine-kvm/releases/download/$(DESCRIBE)/$${bin} > /usr/local/bin/$(PREFIX) \\ " ; \ - echo " chmod +x /usr/local/bin/$(PREFIX)" ; \ + echo " curl -L https://github.com/dhiltgen/docker-machine-kvm/releases/download/$(DESCRIBE)/$${bin} > /usr/local/bin/$(CMD) \\ " ; \ + echo " chmod +x /usr/local/bin/$(CMD)" ; \ echo '```' ; \ done diff --git a/go.mod b/go.mod index be90fc99..df71f2f8 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,6 @@ module github.com/code-ready/machine-driver-libvirt -require github.com/libvirt/libvirt-go v5.2.0+incompatible +require ( + github.com/code-ready/machine v0.7.1-0.20190501073902-87391ca2ceed + github.com/libvirt/libvirt-go v5.2.0+incompatible +) diff --git a/go.sum b/go.sum index 6eaaeee3..50702eb2 100644 --- a/go.sum +++ b/go.sum @@ -1 +1,22 @@ +github.com/bugsnag/bugsnag-go v1.5.1/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= +github.com/bugsnag/panicwrap v1.2.0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= +github.com/code-ready/machine v0.7.1-0.20190501073902-87391ca2ceed h1:ofkhUp+w8H0H0yg31HeHAUrTILg/LsXSKYUXejyhqaw= +github.com/code-ready/machine v0.7.1-0.20190501073902-87391ca2ceed/go.mod h1:2Kr23hBx5xUHetynE+4hFBwn7Xkx5qoF0SY1FzmLz74= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/intel-go/cpuid v0.0.0-20181003105527-1a4a6f06a1c6/go.mod h1:RmeVYf9XrPRbRc3XIx0gLYA8qOFvNoPOfaEZduRlEp4= +github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= +github.com/libvirt/libvirt-go v5.2.0+incompatible h1:rWfBxTWWbDxkxfeXV8G3qr3pS1YRKkUo7C0EHhXzfEw= github.com/libvirt/libvirt-go v5.2.0+incompatible/go.mod h1:34zsnB4iGeOv7Byj6qotuW8Ya4v4Tr43ttjz/F0wjLE= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190422183909-d864b10871cd h1:sMHc2rZHuzQmrbVoSpt9HgerkXPyIeCSO6k0zUMGfFk= +golang.org/x/crypto v0.0.0-20190422183909-d864b10871cd/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From 666ea0d7345e319ecb49bb739af38279ea2cebdd Mon Sep 17 00:00:00 2001 From: Praveen Kumar Date: Wed, 1 May 2019 17:08:39 +0530 Subject: [PATCH 2/2] Bump up the release to 0.11.0 --- constants.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constants.go b/constants.go index d9b89c04..80965e56 100644 --- a/constants.go +++ b/constants.go @@ -2,7 +2,7 @@ package libvirt const ( DriverName = "libvirt" - DriverVersion = "0.9.1" + DriverVersion = "0.11.0" connectionString = "qemu:///system" dnsmasqLeases = "/var/lib/libvirt/dnsmasq/%s.leases"