Skip to content
This repository was archived by the owner on May 3, 2022. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/deis/lightweight-docker-go:v0.7.0
FROM golang:1.12-alpine
ARG LDFLAGS
ENV CGO_ENABLED=0
WORKDIR /go/src/github.com/deislabs/duffle
Expand Down
10 changes: 9 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ BASE_PACKAGE_NAME := github.com/deislabs/duffle

ifneq ($(SKIP_DOCKER),true)
PROJECT_ROOT := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
DEV_IMAGE := quay.io/deis/lightweight-docker-go:v0.7.0
DEV_IMAGE := golang:1.12-stretch
DOCKER_CMD := docker run \
-it \
--rm \
Expand Down Expand Up @@ -65,6 +65,14 @@ MUTABLE_IMAGE_NAME := $(DOCKER_REGISTRY)$(DOCKER_ORG)$(BASE_IMAGE_NAME):$(MUTABL
dep:
$(DOCKER_CMD) dep ensure -v

.PHONY: install-dep
install-dep:
curl https://raw.githubusercontent.com/golang/dep/master/install.sh | INSTALL_DIRECTORY=/usr/local/bin sh

.PHONY: install-golangci-lint
install-golangci-lint:
curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b /usr/local/bin v1.16.0

.PHONY: goimports
goimports:
$(DOCKER_CMD) sh -c "find . -name \"*.go\" | fgrep -v vendor/ | xargs goimports -w -local github.com/deislabs/duffle"
Expand Down
4 changes: 2 additions & 2 deletions brigade.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const { events, Job, Group } = require("brigadier");
const projectOrg = "deislabs";
const projectName = "duffle";

const goImg = "quay.io/deis/lightweight-docker-go:v0.7.0";
const goImg = "golang:1.12-stretch";
const gopath = "/go"
const localPath = gopath + `/src/github.com/${projectOrg}/${projectName}`;

Expand Down Expand Up @@ -67,7 +67,7 @@ function test() {
// Run Go unit tests
job.tasks = [
`cd ${localPath}`,
"make verify-vendored-code lint test"
"make install-dep verify-vendored-code install-golangci-lint lint test"
];
return job;
}
Expand Down
5 changes: 4 additions & 1 deletion pkg/driver/kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ func (k *KubernetesDriver) Run(op *driver.Operation) error {
}

container.EnvFrom = []v1.EnvFromSource{
v1.EnvFromSource{
{
SecretRef: &v1.SecretEnvSource{
LocalObjectReference: v1.LocalObjectReference{
Name: envsecret.ObjectMeta.Name,
Expand Down Expand Up @@ -264,6 +264,9 @@ func (k *KubernetesDriver) watchJobStatusAndLogs(selector metav1.ListOptions, ou
break
}
}
if err != nil {
return err
}

// Wait for pod logs to finish printing
for i := 0; i < int(k.requiredCompletions); i++ {
Expand Down
102 changes: 102 additions & 0 deletions vendor/k8s.io/apimachinery/pkg/util/mergepatch/errors.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

133 changes: 133 additions & 0 deletions vendor/k8s.io/apimachinery/pkg/util/mergepatch/util.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

49 changes: 49 additions & 0 deletions vendor/k8s.io/apimachinery/pkg/util/strategicpatch/errors.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading