Merge

2025-03-25 13:24:18 +00:00 · 2019-03-26 09:59:58 -07:00
parent f79b782a3a
commit 36decb4068
11 changed files with 114 additions and 155 deletions
--- a/Dockerfile.base-build
+++ b/Dockerfile.base-build
@ -0,0 +1,9 @@
+FROM golang:1.12
+ENV GO111MODULE=on
+
+WORKDIR /go/src/github.com/GoogleCloudPlatform/open-match
+COPY . .
+RUN go mod init github.com/GoogleCloudPlatform/open-match
+RUN go mod tidy
+RUN go mod edit -require k8s.io/api@v0.0.0-20190111032252-67edc246be36
+RUN go mod vendor
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@ -43,72 +43,64 @@
 # If a build step has intermediate files that need to be persisted for a future step then use volumes.
 #    An example of this is the go-vol which is where the pkg/ data for go mod is stored.
 #    More information here: https://cloud.google.com/cloud-build/docs/build-config#build_steps
-# 
+# A build step is basically a docker image that is tuned for Cloud Build,
+#    https://github.com/GoogleCloudPlatform/cloud-builders/tree/master/go

-# https://github.com/GoogleCloudPlatform/cloud-builders/tree/master/go
 steps:
-# TODO: Re-enable the docker image targets once they become hermetic.
+- id: 'Docker Image: backendapi'
+  name: gcr.io/cloud-builders/docker
+  args: ['build', '-t', 'gcr.io/$PROJECT_ID/openmatch-backendapi:${_OM_VERSION}-${SHORT_SHA}', 'cmd/backendapi']
+  waitFor: ['-']

-#- id: 'Docker Image: backendapi'
-#  name: gcr.io/cloud-builders/docker
-#  args: ['build', '-t', 'gcr.io/$PROJECT_ID/openmatch-backendapi:${_OM_VERSION}-${SHORT_SHA}', 'cmd/backendapi']
-#  waitFor: ['-']
+- id: 'Docker Image: frontendapi'
+  name: gcr.io/cloud-builders/docker
+  args: ['build', '-t', 'gcr.io/$PROJECT_ID/openmatch-frontendapi:${_OM_VERSION}-${SHORT_SHA}', 'cmd/frontendapi']
+  waitFor: ['-']

-#- id: 'Docker Image: frontendapi'
-#  name: gcr.io/cloud-builders/docker
-#  args: ['build', '-t', 'gcr.io/$PROJECT_ID/openmatch-frontendapi:${_OM_VERSION}-${SHORT_SHA}', 'cmd/frontendapi']
-#  waitFor: ['-']
+- id: 'Docker Image: mmforc'
+  name: gcr.io/cloud-builders/docker
+  args: ['build', '-t', 'gcr.io/$PROJECT_ID/openmatch-mmforc:${_OM_VERSION}-${SHORT_SHA}', 'cmd/mmforc']
+  waitFor: ['-']

-#- id: 'Docker Image: mmforc'
-#  name: gcr.io/cloud-builders/docker
-#  args: ['build', '-t', 'gcr.io/$PROJECT_ID/openmatch-mmforc:${_OM_VERSION}-${SHORT_SHA}', 'cmd/mmforc']
-#  waitFor: ['-']
+- id: 'Docker Image: mmlogicapi'
+  name: gcr.io/cloud-builders/docker
+  args: ['build', '-t', 'gcr.io/$PROJECT_ID/openmatch-mmlogicapi:${_OM_VERSION}-${SHORT_SHA}', 'cmd/mmlogicapi']
+  waitFor: ['-']

-#- id: 'Docker Image: mmlogicapi'
-#  name: gcr.io/cloud-builders/docker
-#  args: ['build', '-t', 'gcr.io/$PROJECT_ID/openmatch-mmlogicapi:${_OM_VERSION}-${SHORT_SHA}', 'cmd/mmlogicapi']
-#  waitFor: ['-']
+- id: 'Docker Image: Evaluator Simple'
+  name: gcr.io/cloud-builders/docker
+  args: ['build', '-t', 'gcr.io/$PROJECT_ID/openmatch-evaluator-simple:${_OM_VERSION}-${SHORT_SHA}', 'examples/evaluators/golang/simple']
+  waitFor: ['Docker Image: open-match-base-build']

-# TODO: This image does not build.
-#- id: 'Docker Image: Evaluator Simple'
-#  name: gcr.io/cloud-builders/docker
-#  args: ['build', '-t', 'gcr.io/$PROJECT_ID/openmatch-evaluator-simple:${_OM_VERSION}-${SHORT_SHA}', 'examples/evaluators/golang/simple']
-#  waitFor: ['-']
+- id: 'Docker Image: openmatch-mmf-cs-mmlogic-simple'
+  name: gcr.io/cloud-builders/docker
+  args: ['build', '-t', 'gcr.io/$PROJECT_ID/openmatch-mmf-cs-mmlogic-simple:${_OM_VERSION}-${SHORT_SHA}', 'examples/functions/csharp/simple']
+  waitFor: ['-']

-#- id: 'Docker Image: openmatch-mmf-cs-mmlogic-simple'
-#  name: gcr.io/cloud-builders/docker
-#  args: ['build', '-t', 'gcr.io/$PROJECT_ID/openmatch-mmf-cs-mmlogic-simple:${_OM_VERSION}-${SHORT_SHA}', 'examples/functions/csharp/simple']
-#  waitFor: ['-']
+- id: 'Docker Image: openmatch-mmf-go-mmlogic-simple'
+  name: gcr.io/cloud-builders/docker
+  args: ['build', '-t', 'gcr.io/$PROJECT_ID/openmatch-mmf-go-mmlogic-simple:${_OM_VERSION}-${SHORT_SHA}', 'examples/functions/golang/manual-simple']
+  waitFor: ['-']

-#- id: 'Docker Image: openmatch-mmf-go-mmlogic-simple'
-#  name: gcr.io/cloud-builders/docker
-#  args: ['build', '-t', 'gcr.io/$PROJECT_ID/openmatch-mmf-go-mmlogic-simple:${_OM_VERSION}-${SHORT_SHA}', 'examples/functions/golang/manual-simple']
-#  waitFor: ['-']
+- id: 'Docker Image: openmatch-mmf-php-mmlogic-simple'
+  name: gcr.io/cloud-builders/docker
+  args: ['build', '-t', 'gcr.io/$PROJECT_ID/openmatch-mmf-php-mmlogic-simple:${_OM_VERSION}-${SHORT_SHA}', 'examples/functions/php/mmlogic-simple']
+  waitFor: ['-']

-#- id: 'Docker Image: openmatch-mmf-php-mmlogic-simple'
-#  name: gcr.io/cloud-builders/docker
-#  args: ['build', '-t', 'gcr.io/$PROJECT_ID/openmatch-mmf-php-mmlogic-simple:${_OM_VERSION}-${SHORT_SHA}', 'examples/functions/php/mmlogic-simple']
-#  waitFor: ['-']
+- id: 'Docker Image: openmatch-mmf-py3-mmlogic-simple'
+  name: gcr.io/cloud-builders/docker
+  args: ['build', '-t', 'gcr.io/$PROJECT_ID/openmatch-mmf-py3-mmlogic-simple:${_OM_VERSION}-${SHORT_SHA}', 'examples/functions/python3/mmlogic-simple']
+  waitFor: ['-']

-#- id: 'Docker Image: openmatch-mmf-py3-mmlogic-simple'
-#  name: gcr.io/cloud-builders/docker
-#  args: ['build', '-t', 'gcr.io/$PROJECT_ID/openmatch-mmf-py3-mmlogic-simple:${_OM_VERSION}-${SHORT_SHA}', 'examples/functions/python3/mmlogic-simple']
-#  waitFor: ['-']
+- id: 'Docker Image: backendclient'
+  name: gcr.io/cloud-builders/docker
+  args: ['build', '-t', 'gcr.io/$PROJECT_ID/openmatch-backendclient:${_OM_VERSION}-${SHORT_SHA}', 'examples/backendclient']
+  waitFor: ['-']

-#- id: 'Docker Image: backendclient'
-#  name: gcr.io/cloud-builders/docker
-#  args: ['build', '-t', 'gcr.io/$PROJECT_ID/openmatch-backendclient:${_OM_VERSION}-${SHORT_SHA}', 'examples/backendclient']
-#  waitFor: ['-']
-
-#- id: 'Docker Image: clientloadgen'
-#  name: gcr.io/cloud-builders/docker
-#  args: ['build', '-t', 'gcr.io/$PROJECT_ID/openmatch-clientloadgen:${_OM_VERSION}-${SHORT_SHA}', 'test/cmd/clientloadgen']
-#  waitFor: ['-']
-
-#- id: 'Docker Image: frontendclient'
-#  name: gcr.io/cloud-builders/docker
-#  args: ['build', '-t', 'gcr.io/$PROJECT_ID/openmatch-frontendclient:${_OM_VERSION}-${SHORT_SHA}', 'test/cmd/frontendclient']
-#  waitFor: ['-']
+- id: 'Docker Image: clientloadgen'
+  name: gcr.io/cloud-builders/docker
+  args: ['build', '-t', 'gcr.io/$PROJECT_ID/openmatch-clientloadgen:${_OM_VERSION}-${SHORT_SHA}', 'test/cmd/clientloadgen']
+  waitFor: ['-']

 # Cannot enable, produces lots of errors but can be useful.
 #- id: 'Lint: YAML Files'
@ -258,23 +250,21 @@ artifacts:
            - examples/backendclient/backendclient
            - test/cmd/clientloadgen/clientloadgen
            - test/cmd/frontendclient/frontendclient
-# TODO: Enable when the Dockerfiles are hermetic.
 images:
-#- 'gcr.io/$PROJECT_ID/openmatch-backendapi:${_OM_VERSION}-${SHORT_SHA}'
-#- 'gcr.io/$PROJECT_ID/openmatch-frontendapi:${_OM_VERSION}-${SHORT_SHA}'
-#- 'gcr.io/$PROJECT_ID/openmatch-mmforc:${_OM_VERSION}-${SHORT_SHA}'
-#- 'gcr.io/$PROJECT_ID/openmatch-mmlogicapi:${_OM_VERSION}-${SHORT_SHA}'
-# Does not build
-#- 'gcr.io/$PROJECT_ID/openmatch-evaluator-simple:${_OM_VERSION}-${SHORT_SHA}'
-#- 'gcr.io/$PROJECT_ID/openmatch-mmf-cs-mmlogic-simple:${_OM_VERSION}-${SHORT_SHA}'
-#- 'gcr.io/$PROJECT_ID/openmatch-mmf-go-mmlogic-simple:${_OM_VERSION}-${SHORT_SHA}'
-#- 'gcr.io/$PROJECT_ID/openmatch-mmf-php-mmlogic-simple:${_OM_VERSION}-${SHORT_SHA}'
-#- 'gcr.io/$PROJECT_ID/openmatch-mmf-py3-mmlogic-simple:${_OM_VERSION}-${SHORT_SHA}'
-#- 'gcr.io/$PROJECT_ID/openmatch-backendclient:${_OM_VERSION}-${SHORT_SHA}'
-#- 'gcr.io/$PROJECT_ID/openmatch-clientloadgen:${_OM_VERSION}-${SHORT_SHA}'
-#- 'gcr.io/$PROJECT_ID/openmatch-frontendclient:${_OM_VERSION}-${SHORT_SHA}'
-#substitutions:
-#    _OM_VERSION: 0.4.0
+- 'gcr.io/$PROJECT_ID/openmatch-backendapi:${_OM_VERSION}-${SHORT_SHA}'
+- 'gcr.io/$PROJECT_ID/openmatch-frontendapi:${_OM_VERSION}-${SHORT_SHA}'
+- 'gcr.io/$PROJECT_ID/openmatch-mmforc:${_OM_VERSION}-${SHORT_SHA}'
+- 'gcr.io/$PROJECT_ID/openmatch-mmlogicapi:${_OM_VERSION}-${SHORT_SHA}'
+- 'gcr.io/$PROJECT_ID/openmatch-evaluator-simple:${_OM_VERSION}-${SHORT_SHA}'
+- 'gcr.io/$PROJECT_ID/openmatch-mmf-cs-mmlogic-simple:${_OM_VERSION}-${SHORT_SHA}'
+- 'gcr.io/$PROJECT_ID/openmatch-mmf-go-mmlogic-simple:${_OM_VERSION}-${SHORT_SHA}'
+- 'gcr.io/$PROJECT_ID/openmatch-mmf-php-mmlogic-simple:${_OM_VERSION}-${SHORT_SHA}'
+- 'gcr.io/$PROJECT_ID/openmatch-mmf-py3-mmlogic-simple:${_OM_VERSION}-${SHORT_SHA}'
+- 'gcr.io/$PROJECT_ID/openmatch-backendclient:${_OM_VERSION}-${SHORT_SHA}'
+- 'gcr.io/$PROJECT_ID/openmatch-clientloadgen:${_OM_VERSION}-${SHORT_SHA}'
+- 'gcr.io/$PROJECT_ID/openmatch-frontendclient:${_OM_VERSION}-${SHORT_SHA}'
+substitutions:
+    _OM_VERSION: 0.4.0
 logsBucket: 'gs://open-match-build-logs/'
 options:
  sourceProvenanceHash: ['SHA256']
--- a/cmd/backendapi/Dockerfile
+++ b/cmd/backendapi/Dockerfile
@ -1,14 +1,6 @@
-# Golang application builder steps
-FROM golang:1.11.5 as builder
-WORKDIR /go/src/github.com/GoogleCloudPlatform/open-match
-# Get only the necessary files from the repo.
-# https://stackoverflow.com/a/39317180/3113674
-# TODO: Set these to the final branch name after RC approval.
-RUN svn export https://github.com/GoogleCloudPlatform/open-match/branches/040wip/internal
-RUN svn export https://github.com/GoogleCloudPlatform/open-match/branches/040wip/config
-WORKDIR /go/src/github.com/GoogleCloudPlatform/open-match/cmd/backendapi
-COPY . .
-RUN go get -d -v
+FROM open-match-base-build as builder
+
+WORKDIR /go/src/github.com/GoogleCloudPlatform/open-match/cmd/backendapi/
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo .

 FROM gcr.io/distroless/static  
--- a/cmd/frontendapi/Dockerfile
+++ b/cmd/frontendapi/Dockerfile
@ -1,14 +1,6 @@
-# Golang application builder steps
-FROM golang:1.11.5 as builder
-WORKDIR /go/src/github.com/GoogleCloudPlatform/open-match
-# Get only the necessary files from the repo.
-# https://stackoverflow.com/a/39317180/3113674
-# TODO: Set these to the final branch name after RC approval.
-RUN svn export https://github.com/GoogleCloudPlatform/open-match/branches/040wip/internal
-RUN svn export https://github.com/GoogleCloudPlatform/open-match/branches/040wip/config
-WORKDIR /go/src/github.com/GoogleCloudPlatform/open-match/cmd/frontendapi
-COPY . .
-RUN go get -d -v
+FROM open-match-base-build as builder
+
+WORKDIR /go/src/github.com/GoogleCloudPlatform/open-match/cmd/frontendapi/
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo .

 FROM gcr.io/distroless/static  
--- a/cmd/mmforc/Dockerfile
+++ b/cmd/mmforc/Dockerfile
@ -1,28 +1,9 @@
-# Golang application builder steps
-FROM golang:1.11.5 as builder 
-
-# Necessary to get a specific version of the golang k8s client
-RUN go get github.com/tools/godep
-RUN go get k8s.io/client-go/...
-WORKDIR /go/src/k8s.io/client-go
-RUN git checkout v7.0.0
-RUN godep restore ./...
-RUN rm -rf vendor/
-RUN rm -rf /go/src/github.com/golang/protobuf/
-
-# Get only the necessary files from the repo.
-# https://stackoverflow.com/a/39317180/3113674
-# TODO: Set these to the final branch name after RC approval.
-WORKDIR /go/src/github.com/GoogleCloudPlatform/open-match
-RUN svn export https://github.com/GoogleCloudPlatform/open-match/branches/040wip/internal
-RUN svn export https://github.com/GoogleCloudPlatform/open-match/branches/040wip/config
+FROM open-match-base-build as builder

 WORKDIR /go/src/github.com/GoogleCloudPlatform/open-match/cmd/mmforc/
-COPY . .
-RUN go get -d -v 
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo .

-FROM gcr.io/distroless/static
+FROM gcr.io/distroless/static  
 COPY --from=builder /go/src/github.com/GoogleCloudPlatform/open-match/cmd/mmforc/mmforc .

-CMD ["/mmforc"]
+ENTRYPOINT ["/mmforc"]
--- a/cmd/mmlogicapi/Dockerfile
+++ b/cmd/mmlogicapi/Dockerfile
@ -1,14 +1,6 @@
-# Golang application builder steps
-FROM golang:1.11.5 as builder
-WORKDIR /go/src/github.com/GoogleCloudPlatform/open-match
-# Get only the necessary files from the repo.
-# https://stackoverflow.com/a/39317180/3113674
-# TODO: Set these to the final branch name after RC approval.
-RUN svn export https://github.com/GoogleCloudPlatform/open-match/branches/040wip/internal
-RUN svn export https://github.com/GoogleCloudPlatform/open-match/branches/040wip/config
-WORKDIR /go/src/github.com/GoogleCloudPlatform/open-match/cmd/mmlogicapi
-COPY . .
-RUN go get -d -v
+FROM open-match-base-build as builder
+
+WORKDIR /go/src/github.com/GoogleCloudPlatform/open-match/cmd/mmlogicapi/
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo .

 FROM gcr.io/distroless/static  
--- a/examples/backendclient/Dockerfile
+++ b/examples/backendclient/Dockerfile
@ -1,8 +1,9 @@
-#FROM golang:1.10.3 as builder
-FROM gcr.io/open-match-public-images/openmatch-base:dev as builder
-WORKDIR /go/src/github.com/GoogleCloudPlatform/open-match/examples/backendclient
-COPY ./ ./
-RUN go get -d -v 
-RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o backendclient . 
+FROM open-match-base-build as builder

-CMD ["./backendclient"]
+WORKDIR /go/src/github.com/GoogleCloudPlatform/open-match/examples/backendclient/
+RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo .
+
+FROM gcr.io/distroless/static  
+COPY --from=builder /go/src/github.com/GoogleCloudPlatform/open-match/examples/backendclient/backendclient .
+
+ENTRYPOINT ["/backendclient"]
--- a/examples/evaluators/golang/simple/Dockerfile
+++ b/examples/evaluators/golang/simple/Dockerfile
@ -1,11 +1,10 @@
-# Golang application builder steps
-FROM gcr.io/open-match-public-images/openmatch-base:dev as builder
-WORKDIR /go/src/github.com/GoogleCloudPlatform/open-match/examples/evaluators/golang/simple
-COPY . .
-RUN go get -d -v
+FROM open-match-base-build as builder
+
+WORKDIR /go/src/github.com/GoogleCloudPlatform/open-match/examples/evaluators/golang/simple/
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo .

-FROM gcr.io/distroless/static
-COPY --from=builder /go/src/github.com/GoogleCloudPlatform/open-match/examples/evaluators/golang/simple .
+FROM gcr.io/distroless/static  
+COPY --from=builder /go/src/github.com/GoogleCloudPlatform/open-match/examples/evaluators/golang/simple/simple .
+COPY --from=builder /go/src/github.com/GoogleCloudPlatform/open-match/config/matchmaker_config.yaml ./config/

-ENTRYPOINT ["./simple"]
+ENTRYPOINT ["/simple"]
--- a/examples/functions/golang/manual-simple/Dockerfile
+++ b/examples/functions/golang/manual-simple/Dockerfile
@ -1,10 +1,9 @@
-# Golang application builder steps
-FROM gcr.io/open-match-public-images/openmatch-base:dev as builder
+FROM open-match-base-build as builder
+
 WORKDIR /go/src/github.com/GoogleCloudPlatform/open-match/examples/functions/golang/manual-simple
-COPY . .
-RUN go get -d -v
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o mmf .

-FROM gcr.io/distroless/static
+FROM gcr.io/distroless/static  
 COPY --from=builder /go/src/github.com/GoogleCloudPlatform/open-match/examples/functions/golang/manual-simple/mmf .
-CMD ["/mmf"]
+
+ENTRYPOINT ["/mmf"]
--- a/test/cmd/clientloadgen/Dockerfile
+++ b/test/cmd/clientloadgen/Dockerfile
@ -1,7 +1,9 @@
-FROM golang:1.10.3 as builder
+FROM open-match-base-build as builder
+
 WORKDIR /go/src/github.com/GoogleCloudPlatform/open-match/test/cmd/clientloadgen/
-COPY ./ ./
-RUN go get -d -v 
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o clientloadgen . 

-CMD ["./clientloadgen"]
+FROM gcr.io/distroless/static  
+COPY --from=builder /go/src/github.com/GoogleCloudPlatform/open-match/test/cmd/clientloadgen/clientloadgen .
+
+ENTRYPOINT ["/clientloadgen"]
--- a/test/cmd/frontendclient/Dockerfile
+++ b/test/cmd/frontendclient/Dockerfile
@ -1,7 +1,9 @@
-FROM golang:1.10.3 as builder
-WORKDIR /go/src/github.com/GoogleCloudPlatform/open-match/test/cmd/frontendclient
-COPY ./ ./
-RUN go get -d -v 
+FROM open-match-base-build as builder
+
+WORKDIR /go/src/github.com/GoogleCloudPlatform/open-match/test/cmd/frontendclient/
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o frontendclient . 

-CMD ["./frontendclient"]
+FROM gcr.io/distroless/static  
+COPY --from=builder /go/src/github.com/GoogleCloudPlatform/open-match/test/cmd/frontendclient/frontendclient .
+
+ENTRYPOINT ["/frontendclient"]