Cross compile Skaffold, with CGO=1, using xgo

Fixes #1936

Signed-off-by: David Gageot <david@gageot.net>

.travis.yml

@@ -17,7 +17,7 @@ before_script:
   - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
 
 script:
-  - make out/skaffold
+  - make install
   - make test
 
 after_success:

Makefile

@@ -50,13 +50,17 @@ GO_LDFLAGS += -X $(VERSION_PACKAGE).gitTreeState=$(if $(shell git status --porce
 GO_LDFLAGS +="
 
 GO_FILES := $(shell find . -type f -name '*.go' -not -path "./vendor/*")
-GO_BUILD_TAGS := "kqueue"
 
 $(BUILD_DIR)/$(PROJECT): $(BUILD_DIR)/$(PROJECT)-$(GOOS)-$(GOARCH)
 	cp $(BUILD_DIR)/$(PROJECT)-$(GOOS)-$(GOARCH) $@
 
-$(BUILD_DIR)/$(PROJECT)-%-$(GOARCH): $(GO_FILES) $(BUILD_DIR)
-	GOOS=$* GOARCH=$(GOARCH) CGO_ENABLED=0 go build -ldflags $(GO_LDFLAGS) -gcflags $(GO_GCFLAGS) -asmflags $(GO_ASMFLAGS) -tags $(GO_BUILD_TAGS) -o $@ $(BUILD_PACKAGE)
+.PHONY: xgo
+xgo:
+	go get github.com/karalabe/xgo
+
+$(BUILD_DIR)/$(PROJECT)-%-$(GOARCH): xgo $(GO_FILES) $(BUILD_DIR)
+	xgo -go 1.12 -dest $(BUILD_DIR) -out $(PROJECT) --pkg cmd/skaffold --targets=$*/$(GOARCH) -ldflags $(GO_LDFLAGS) .
+	mv $(BUILD_DIR)/$(PROJECT)-$** $@
 
 %.sha256: %
 	shasum -a 256 $< > $@
@@ -82,7 +86,7 @@ test: $(BUILD_DIR)
 
 .PHONY: install
 install: $(GO_FILES) $(BUILD_DIR)
-	GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=0 go install -ldflags $(GO_LDFLAGS) -gcflags $(GO_GCFLAGS) -asmflags $(GO_ASMFLAGS) -tags $(GO_BUILD_TAGS) $(BUILD_PACKAGE)
+	GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=1 go install -ldflags $(GO_LDFLAGS) -gcflags $(GO_GCFLAGS) -asmflags $(GO_ASMFLAGS) $(BUILD_PACKAGE)
 
 .PHONY: integration
 integration: install

deploy/skaffold/Dockerfile

@@ -88,18 +88,13 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge
 COPY --from=golang:1.11 /usr/local/go /usr/local/go
 ENV PATH /usr/local/go/bin:/go/bin:$PATH
 ENV GOPATH /go/
-
 WORKDIR /go/src/github.com/GoogleContainerTools/skaffold
-
 COPY . .
 
 FROM builder as integration
 ARG VERSION
-
-RUN make out/skaffold-linux-amd64 VERSION=$VERSION && mv out/skaffold-linux-amd64 /usr/bin/skaffold
-
+RUN make install
 CMD ["make", "integration"]
 
 FROM runtime_deps as distribution
-
 COPY --from=integration /usr/bin/skaffold /usr/bin/skaffold