Merge pull request #135 from jeremyje/master

Merge 040wip into master.
googleforgames · Mar 29, 2019 · 6dd23ff · 6dd23ff
2 parents 9c943d5 + 03c7db7
commit 6dd23ff
Show file tree

Hide file tree

Showing 8,369 changed files with 342,484 additions and 4,358 deletions.
diff --git a/.gcloudignore b/.gcloudignore
@@ -12,3 +12,4 @@
 # below:
 .git
 .gitignore
+#!include:.gitignore
diff --git a/.gitignore b/.gitignore
@@ -25,7 +25,7 @@
 populations
 
 # local config files
-*.json
+#*.json
 
 # Discarded code snippets
 build.sh
@@ -67,3 +67,26 @@ msbuild.wrn
 
 # Visual Studio 2015
 .vs/
+
+# Goland
+.idea/
+
+# Nodejs files placed when building Hugo, ok to allow if we actually start using Nodejs.
+package.json
+package-lock.json
+
+site/resources/_gen/
+
+# Node Modules
+node_modules/
+
+# Compiled Binaries
+cmd/backendapi/backendapi
+cmd/frontendapi/frontendapi
+cmd/mmforc/mmforc
+cmd/mmlogicapi/mmlogicapi
+examples/backendclient/backendclient
+examples/evaluators/golang/simple/simple
+examples/functions/golang/manual-simple/manual-simple
+test/cmd/clientloadgen/clientloadgen
+test/cmd/frontendclient/frontendclient
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Release history
 
+## v0.4.0 (alpha)
+
+### Release notes
+- Thanks to completion of Issues [#42](issues/42) and [#45](issues/45), there is no longer a need to use the `openmatch-base` image when building components of Open Match.  Each stand alone appliation now is self-contained in its `Dockerfile` and `cloudbuild.yaml` files, and builds have been substantially simplified.  **Note**: The default `Dockerfile` and `cloudbuild.yaml` now tag their images with the version number, not `dev`, and the YAML files in the `install` directory now reflect this.
+ - This paves the way for CI/CD in an upcoming version.  
+ - This paves the way for public images in an upcoming version!
+
 ## v0.3.0 (alpha)
   This update is focused on the Frontend API and Player Records, including more robust code for indexing, deindexing, reading, writing, and expiring player requests from Open Match state storage.  All Frontend API function argument have changed, although many only slightly. Please join the [Slack channel](https://open-match.slack.com/) if you need help ([Signup link](https://join.slack.com/t/open-match/shared_invite/enQtNDM1NjcxNTY4MTgzLWQzMzE1MGY5YmYyYWY3ZjE2MjNjZTdmYmQ1ZTQzMmNiNGViYmQyN2M4ZmVkMDY2YzZlOTUwMTYwMzI1Y2I2MjU))!
 

diff --git a/Dockerfile.base b/Dockerfile.base
@@ -2,6 +2,8 @@
 FROM golang:1.10.3 as builder
 WORKDIR /go/src/github.com/GoogleCloudPlatform/open-match
 COPY config config
+RUN rm -f config/matchmaker_config.json
+RUN rm -f config/matchmaker_config.yaml
 COPY internal internal
 WORKDIR /go/src/github.com/GoogleCloudPlatform/open-match/internal
 RUN go get -d -v ...
diff --git a/Dockerfile.base-build b/Dockerfile.base-build
@@ -0,0 +1,7 @@
+FROM golang:1.12
+ENV GO111MODULE=on
+
+WORKDIR /go/src/github.com/GoogleCloudPlatform/open-match
+COPY . .
+RUN go mod download
+
diff --git a/Dockerfile.mmf_php b/Dockerfile.mmf_php
diff --git a/Dockerfile.mmf_py3 b/Dockerfile.mmf_py3