Merge pull request #1336 from gtardif/fix_sidecar_Dockerfiles

Fix sidecar Dockerfiles : Go 1.16 uses go modules by default
This commit is contained in:
Guillaume Tardif 2021-02-22 17:24:10 +01:00 committed by GitHub
commit 3f54d7f4d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View File

@ -15,7 +15,7 @@
FROM golang:1.16 AS builder FROM golang:1.16 AS builder
WORKDIR $GOPATH/src/github.com/docker/compose-cli/aci/etchosts WORKDIR $GOPATH/src/github.com/docker/compose-cli/aci/etchosts
COPY . . COPY . .
RUN CGO_ENABLED=0 go build -ldflags="-w -s" -o /go/bin/hosts main/main.go RUN GO111MODULE=auto CGO_ENABLED=0 go build -ldflags="-w -s" -o /go/bin/hosts main/main.go
FROM scratch FROM scratch
COPY --from=builder /go/bin/hosts /hosts COPY --from=builder /go/bin/hosts /hosts

View File

@ -15,7 +15,7 @@
FROM golang:1.16 AS builder FROM golang:1.16 AS builder
WORKDIR $GOPATH/src/github.com/docker/compose-cli/ecs/resolv WORKDIR $GOPATH/src/github.com/docker/compose-cli/ecs/resolv
COPY . . COPY . .
RUN CGO_ENABLED=0 go build -ldflags="-w -s" -o /go/bin/resolv main/main.go RUN GO111MODULE=auto CGO_ENABLED=0 go build -ldflags="-w -s" -o /go/bin/resolv main/main.go
FROM scratch FROM scratch
COPY --from=builder /go/bin/resolv /resolv COPY --from=builder /go/bin/resolv /resolv

View File

@ -15,7 +15,7 @@
FROM golang:1.16 AS builder FROM golang:1.16 AS builder
WORKDIR $GOPATH/src/github.com/docker/compose-cli/ecs/secrets WORKDIR $GOPATH/src/github.com/docker/compose-cli/ecs/secrets
COPY . . COPY . .
RUN CGO_ENABLED=0 go build -ldflags="-w -s" -o /go/bin/secrets main/main.go RUN GO111MODULE=auto CGO_ENABLED=0 go build -ldflags="-w -s" -o /go/bin/secrets main/main.go
FROM scratch FROM scratch
COPY --from=builder /go/bin/secrets /secrets COPY --from=builder /go/bin/secrets /secrets