From e87ad3f8a22994c9ae4e101b8897ff9a6ed33ace Mon Sep 17 00:00:00 2001 From: Lee Brown Date: Mon, 26 Aug 2019 17:01:58 -0800 Subject: [PATCH] enable builds to use GOPROXY --- build/cicd/internal/config/function.go | 3 ++- cmd/web-api/Dockerfile | 2 ++ cmd/web-app/Dockerfile | 2 ++ go.mod | 2 +- go.sum | 2 ++ 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/build/cicd/internal/config/function.go b/build/cicd/internal/config/function.go index 214e499..a9475e8 100644 --- a/build/cicd/internal/config/function.go +++ b/build/cicd/internal/config/function.go @@ -1,6 +1,7 @@ package config import ( + "fmt" "log" "path/filepath" @@ -27,7 +28,7 @@ var FunctionNames = []Function{ func NewFunction(funcName string, cfg *devdeploy.Config) (*devdeploy.ProjectFunction, error) { ctx := &devdeploy.ProjectFunction{ - Name: funcName, + Name: fmt.Sprintf("%s-%s-%s", cfg.Env, cfg.ProjectName, funcName), CodeDir: filepath.Join(cfg.ProjectRoot, "cmd", funcName), DockerBuildDir: cfg.ProjectRoot, DockerBuildContext: ".", diff --git a/cmd/web-api/Dockerfile b/cmd/web-api/Dockerfile index 4883c55..9a1498c 100644 --- a/cmd/web-api/Dockerfile +++ b/cmd/web-api/Dockerfile @@ -25,6 +25,8 @@ RUN GO111MODULE=on go get -u github.com/geeks-accelerator/swag/cmd/swag WORKDIR $GOPATH/src/gitlab.com/geeks-accelerator/oss/saas-starter-kit # Enable go modules. +ARG GOPROXY=https://goproxy.io +ENV GOPROXY=$GOPROXY ENV GO111MODULE="on" COPY go.mod . COPY go.sum . diff --git a/cmd/web-app/Dockerfile b/cmd/web-app/Dockerfile index b0a1ac5..4d27eb9 100644 --- a/cmd/web-app/Dockerfile +++ b/cmd/web-app/Dockerfile @@ -9,6 +9,8 @@ RUN apk --update --no-cache add \ WORKDIR $GOPATH/src/gitlab.com/geeks-accelerator/oss/saas-starter-kit # Enable go modules. +ARG GOPROXY=https://goproxy.io +ENV GOPROXY=$GOPROXY ENV GO111MODULE="on" COPY go.mod . COPY go.sum . diff --git a/go.mod b/go.mod index 05023ff..ba7b54a 100644 --- a/go.mod +++ b/go.mod @@ -41,7 +41,7 @@ require ( github.com/tinylib/msgp v1.1.0 // indirect github.com/urfave/cli v1.21.0 github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2 - gitlab.com/geeks-accelerator/oss/devops v1.0.16 + gitlab.com/geeks-accelerator/oss/devops v1.0.17 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 golang.org/x/tools v0.0.0-20190807223507-b346f7fd45de // indirect diff --git a/go.sum b/go.sum index 2a353c8..25449ae 100644 --- a/go.sum +++ b/go.sum @@ -225,6 +225,8 @@ gitlab.com/geeks-accelerator/oss/devops v1.0.15 h1:JEadFDCPVqKSNFLFBNmqm94SU0AhO gitlab.com/geeks-accelerator/oss/devops v1.0.15/go.mod h1:xr+rhNSDXrEh0A6bkBPnfMiRIou3OiPZK0oD5h9GAAM= gitlab.com/geeks-accelerator/oss/devops v1.0.16 h1:/dudDP9MjctP5caHpVZfJcxlC7ZeOW+KzaQ2UOzQ2hI= gitlab.com/geeks-accelerator/oss/devops v1.0.16/go.mod h1:xr+rhNSDXrEh0A6bkBPnfMiRIou3OiPZK0oD5h9GAAM= +gitlab.com/geeks-accelerator/oss/devops v1.0.17 h1:5m6gEH9OXoGs48dtodcHbL0u3g6q3yiTsJ75IpjcFa8= +gitlab.com/geeks-accelerator/oss/devops v1.0.17/go.mod h1:xr+rhNSDXrEh0A6bkBPnfMiRIou3OiPZK0oD5h9GAAM= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=