Skip to content

Build with Go 1.12 #2396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 4, 2019
Merged
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
16 changes: 4 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,27 @@ go_import_path: github.com/GoogleContainerTools/skaffold
jobs:
include:
- os: linux
go: "1.11.x"
go: "1.12.x"
script:
- make
- make test
after_success:
- bash <(curl -s https://codecov.io/bash)
- os: osx
go: "1.11.x"
go: "1.12.x"
script:
- make
- make test
after_success:
- bash <(curl -s https://codecov.io/bash)
- os: linux
go: "1.12.x"
script:
- make
- os: osx
go: "1.12.x"
script:
- make
- os: windows
go: "1.11.x"
go: "1.12.x"
script:
- go build -o out/skaffold.exe cmd/skaffold/skaffold.go
- go test -short -timeout 60s ./...
- stage: integration
os: linux
go: "1.11.x"
go: "1.12.x"
before_install:
- curl -Lo ${HOME}/bin/kind https://github.com/kubernetes-sigs/kind/releases/download/v0.4.0/kind-linux-amd64
- chmod +x ${HOME}/bin/kind
Expand Down
2 changes: 1 addition & 1 deletion DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This doc explains the development workflow so you can get started
You must install these tools:

1. [`go`](https://golang.org/doc/install): The language skaffold is
built in (version >= go 1.11)
built in (version >= go 1.12)
1. [`git`](https://help.github.com/articles/set-up-git/): For source control
1. [`dep`](https://github.com/golang/dep): For managing external Go
dependencies. - Please Install dep v0.5.0 or greater.
Expand Down
2 changes: 1 addition & 1 deletion deploy/skaffold/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge
software-properties-common \
apt-transport-https && \
rm -rf /var/lib/apt/lists/*
COPY --from=golang:1.11 /usr/local/go /usr/local/go
COPY --from=golang:1.12 /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
Expand Down
2 changes: 1 addition & 1 deletion deploy/webhook/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ COPY --from=download-docsy /docsy ./themes/docsy
COPY --from=download-hugo /hugo /usr/local/bin/
COPY --from=download-kubectl /kubectl /usr/local/bin/

FROM golang:1.11 as webhook
FROM golang:1.12 as webhook
WORKDIR $GOPATH/src/github.com/GoogleContainerTools/skaffold
COPY . .
RUN go build -o /webhook webhook/webhook.go
Expand Down
2 changes: 1 addition & 1 deletion examples/compose/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.5-alpine3.9 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY main.go .
RUN go build -o /app main.go

Expand Down
2 changes: 1 addition & 1 deletion examples/getting-started/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.5-alpine3.9 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY main.go .
RUN go build -o /app main.go

Expand Down
2 changes: 1 addition & 1 deletion examples/google-cloud-build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.5-alpine3.9 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY main.go .
RUN go build -o /app main.go

Expand Down
2 changes: 1 addition & 1 deletion examples/kaniko-local/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.5-alpine3.9 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY main.go .
RUN go build -o /app main.go

Expand Down
2 changes: 1 addition & 1 deletion examples/kaniko/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.5-alpine3.9 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY main.go .
RUN go build -o /app main.go

Expand Down
2 changes: 1 addition & 1 deletion examples/microservices/leeroy-app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.5-alpine3.9 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY app.go .
RUN go build -o /app .

Expand Down
2 changes: 1 addition & 1 deletion examples/microservices/leeroy-web/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.5-alpine3.9 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY web.go .
RUN go build -o /web .

Expand Down
2 changes: 1 addition & 1 deletion examples/structure-tests/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.5-alpine3.9 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY main.go .
RUN go build -o /app main.go

Expand Down
2 changes: 1 addition & 1 deletion examples/tagging-with-environment-variables/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.5-alpine3.9 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY main.go .
RUN go build -o /app main.go

Expand Down
2 changes: 1 addition & 1 deletion integration/examples/compose/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.5-alpine3.9 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY main.go .
RUN go build -o /app main.go

Expand Down
2 changes: 1 addition & 1 deletion integration/examples/getting-started/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.5-alpine3.9 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY main.go .
RUN go build -o /app main.go

Expand Down
2 changes: 1 addition & 1 deletion integration/examples/google-cloud-build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.5-alpine3.9 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY main.go .
RUN go build -o /app main.go

Expand Down
2 changes: 1 addition & 1 deletion integration/examples/kaniko-local/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.5-alpine3.9 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY main.go .
RUN go build -o /app main.go

Expand Down
2 changes: 1 addition & 1 deletion integration/examples/kaniko/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.5-alpine3.9 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY main.go .
RUN go build -o /app main.go

Expand Down
2 changes: 1 addition & 1 deletion integration/examples/microservices/leeroy-app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.5-alpine3.9 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY app.go .
RUN go build -o /app .

Expand Down
2 changes: 1 addition & 1 deletion integration/examples/microservices/leeroy-web/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.5-alpine3.9 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY web.go .
RUN go build -o /web .

Expand Down
2 changes: 1 addition & 1 deletion integration/examples/structure-tests/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.5-alpine3.9 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY main.go .
RUN go build -o /app main.go

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.5-alpine3.9 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY main.go .
RUN go build -o /app main.go

Expand Down
4 changes: 2 additions & 2 deletions integration/testdata/fix/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM golang:1.10.1-alpine3.7 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY main.go .
RUN go build -o /app main.go

FROM alpine:3.7
FROM alpine:3.9
CMD ["./app"]
COPY --from=builder /app .
4 changes: 2 additions & 2 deletions integration/testdata/gcb-sub-folder/sub/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM golang:1.10.1-alpine3.7 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY main.go .
RUN go build -o /app main.go

FROM alpine:3.7
FROM alpine:3.9
CMD ["./app"]
COPY --from=builder /app .
4 changes: 2 additions & 2 deletions integration/testdata/init/compose/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM golang:1.10.1-alpine3.7 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY main.go .
RUN go build -o /app main.go

FROM alpine:3.7
FROM alpine:3.9
CMD ["./app"]
COPY --from=builder /app .
4 changes: 2 additions & 2 deletions integration/testdata/init/hello/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM golang:1.10.1-alpine3.7 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY main.go .
RUN go build -o /app main.go

FROM alpine:3.7
FROM alpine:3.9
CMD ["./app"]
COPY --from=builder /app .
4 changes: 2 additions & 2 deletions integration/testdata/init/microservices/leeroy-app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM golang:1.10.1-alpine3.7 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY app.go .
RUN go build -o /app .

FROM alpine:3.7
FROM alpine:3.9
CMD ["./app"]
COPY --from=builder /app .
4 changes: 2 additions & 2 deletions integration/testdata/init/microservices/leeroy-web/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM golang:1.10.1-alpine3.7 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY web.go .
RUN go build -o /web .

FROM alpine:3.7
FROM alpine:3.9
CMD ["./web"]
COPY --from=builder /web .
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM golang:1.10.1-alpine3.7 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY app.go .
RUN go build -o /app .

FROM alpine:3.7 as target_stage
FROM alpine:3.9 as target_stage
CMD ["./app"]
COPY --from=builder /app .

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM golang:1.10.1-alpine3.7 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY web.go .
RUN go build -o /web .

FROM alpine:3.7
FROM alpine:3.9
CMD ["./web"]
COPY --from=builder /web .
4 changes: 2 additions & 2 deletions integration/testdata/kaniko-sub-folder/sub/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM golang:1.10.1-alpine3.7 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY main.go .
RUN go build -o /app main.go

FROM alpine:3.7
FROM alpine:3.9
CMD ["./app"]
COPY --from=builder /app .
2 changes: 1 addition & 1 deletion integration/testdata/kaniko-target/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.5-alpine3.9 as builder
FROM golang:1.12.6-alpine3.9 as builder
COPY main.go .
RUN go build -o /app main.go

Expand Down