From c98ff79aba40bd268887de6e09a9a54ec833b2e4 Mon Sep 17 00:00:00 2001 From: Henry Jenkins Date: Sat, 13 Jul 2019 22:12:20 +0100 Subject: [PATCH] Update other docker files --- Dockerfile.arm64 | 4 +--- Dockerfile.armv6 | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index f4bf495a..e2e29c82 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,8 +1,6 @@ FROM golang:1.12-stretch AS builder # Download tools -RUN wget -O $GOPATH/bin/dep https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 -RUN chmod +x $GOPATH/bin/dep RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.17.1 # Copy sources @@ -10,7 +8,7 @@ WORKDIR $GOPATH/src/github.com/pusher/oauth2_proxy COPY . . # Fetch dependencies -RUN dep ensure --vendor-only +RUN go mod download # Build binary and make sure there is at least an empty key file. # This is useful for GCP App Engine custom runtime builds, because diff --git a/Dockerfile.armv6 b/Dockerfile.armv6 index 32bb1242..21ca4cb5 100644 --- a/Dockerfile.armv6 +++ b/Dockerfile.armv6 @@ -1,8 +1,6 @@ FROM golang:1.12-stretch AS builder # Download tools -RUN wget -O $GOPATH/bin/dep https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 -RUN chmod +x $GOPATH/bin/dep RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.17.1 # Copy sources @@ -10,7 +8,7 @@ WORKDIR $GOPATH/src/github.com/pusher/oauth2_proxy COPY . . # Fetch dependencies -RUN dep ensure --vendor-only +RUN go mod download # Build binary and make sure there is at least an empty key file. # This is useful for GCP App Engine custom runtime builds, because