Release 1.8-rc1

.github/ISSUE_TEMPLATE/release.md

@@ -37,7 +37,7 @@ then you'll need to create the release branch.
 
 ```shell
 # Create a local release branch.
-git checkout -b release-0.5 upstream/master
+git checkout -b release-0.5 upstream/main
 # Push the branch upstream.
 git push upstream release-0.5
 ```
@@ -76,7 +76,7 @@ Hot Fixes:
 
 Preview:
 
-* Rare, a one off release cut from the master branch to provide early access
+* Rare, a one off release cut from the main branch to provide early access
   to APIs or some other major change.
 * **NOTE: There's no branch for this release.** 
 * Example: 0.5-preview.1
@@ -98,7 +98,7 @@ only required once.**
 
 - [ ] Create the branch in the **upstream** repository. It should be named
   release-X.Y. Example: release-0.5. At this point there's effectively a code
-  freeze for this version and all work on master will be included in a future
+  freeze for this version and all work on main will be included in a future
   version. If you're on the branch that you created in the *getting setup*
   section above you should be able to push upstream.
 
@@ -131,12 +131,12 @@ git push origin release-0.5
 only required once.**
 - [ ] Create the next [version milestone](https://github.com/googleforgames/open-match/milestones) and use [semantic versioning](https://semver.org/) when naming it to be consistent with the [Go community](https://blog.golang.org/versioning-proposal).
 - [ ] Create a *draft* [release](https://github.com/googleforgames/open-match/releases).  Note that github has both "Pre-release" and "draft" as different concepts for a release.  Until the release is finalized, only use "Save draft", and do not use "Publish release".
-- [ ] Use the [release template](https://github.com/googleforgames/open-match/blob/master/docs/governance/templates/release.md)
+- [ ] Use the [release template](https://github.com/googleforgames/open-match/blob/main/docs/governance/templates/release.md)
   - [ ] `Tag` = v{version}. Example: v0.5.0. Append -rc.# for release candidates. Example: v0.5.0-rc.1.
   - [ ] `Target` = release-X.Y. Example: release-0.5.
   - [ ] `Release Title` = `Tag`
-  - [ ] `Write` section will contain the contents from the [release template](https://github.com/googleforgames/open-match/blob/master/docs/governance/templates/release.md).
-- [ ] Add the milestone to all PRs and issues that were merged since the last milestone. Look at the [releases page](https://github.com/googleforgames/open-match/releases) and look for the "X commits to master since this release" for the diff.
+  - [ ] `Write` section will contain the contents from the [release template](https://github.com/googleforgames/open-match/blob/main/docs/governance/templates/release.md).
+- [ ] Add the milestone to all PRs and issues that were merged since the last milestone. Look at the [releases page](https://github.com/googleforgames/open-match/releases) and look for the "X commits to main since this release" for the diff.
 - [ ] Review all [milestone-less closed issues](https://github.com/googleforgames/open-match/issues?q=is%3Aissue+is%3Aclosed+no%3Amilestone) and assign the appropriate milestone.
 - [ ] Review all [issues in milestone](https://github.com/googleforgames/open-match/milestones) for proper [labels](https://github.com/googleforgames/open-match/labels) (ex: area/build).
 - [ ] Review all [milestone-less closed PRs](https://github.com/googleforgames/open-match/pulls?q=is%3Apr+is%3Aclosed+no%3Amilestone) and assign the appropriate milestone.
@@ -175,9 +175,9 @@ only required once.**
 
 [om-slack]: https://open-match.slack.com/
 [mailing-list-post]: https://groups.google.com/forum/#!newtopic/open-match-discuss
-[release-template]: https://github.com/googleforgames/open-match/blob/master/docs/governance/templates/release.md
-[makefile-version]: https://github.com/googleforgames/open-match/blob/master/Makefile#L53
-[om-chart-yaml-version]: https://github.com/googleforgames/open-match/blob/master/install/helm/open-match/Chart.yaml#L16
-[om-values-yaml-version]: https://github.com/googleforgames/open-match/blob/master/install/helm/open-match/values.yaml#L16
+[release-template]: https://github.com/googleforgames/open-match/blob/main/docs/governance/templates/release.md
+[makefile-version]: https://github.com/googleforgames/open-match/blob/main/Makefile#L53
+[om-chart-yaml-version]: https://github.com/googleforgames/open-match/blob/main/install/helm/open-match/Chart.yaml#L16
+[om-values-yaml-version]: https://github.com/googleforgames/open-match/blob/main/install/helm/open-match/values.yaml#L16
 [om-release]: https://github.com/googleforgames/open-match/releases/new
-[readme-deploy]: https://github.com/googleforgames/open-match/blob/master/README.md#deploy-to-kubernetes
+[readme-deploy]: https://github.com/googleforgames/open-match/blob/main/README.md#deploy-to-kubernetes

Dockerfile.base-build

@@ -13,8 +13,7 @@
 # limitations under the License.
 
 # When updating Go version, update Dockerfile.ci, Dockerfile.base-build, and go.mod
-FROM golang:1.19.5
-ENV GO111MODULE=on
+FROM golang:1.21.0
 
 WORKDIR /go/src/open-match.dev/open-match
 

Dockerfile.ci

@@ -11,49 +11,65 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+FROM debian:bookworm
 
-FROM debian
+# set env vars
+ARG DEBIAN_FRONTEND=noninteractive
+ENV OPEN_MATCH_CI_MODE=1
+ENV KUBECONFIG=$HOME/.kube/config
+ENV GOPATH=/go
+ENV PATH=$GOPATH/bin:/usr/local/go/bin:$PATH
 
-RUN apt-get update
-RUN apt-get install -y -qq git make python3 virtualenv curl sudo unzip apt-transport-https ca-certificates curl software-properties-common gnupg2
+RUN apt-get update -y \
+ && apt-get install -y -qq --no-install-recommends \
+            apt-utils \
+            git \
+            make \
+            python3 \
+            virtualenv \
+            curl \
+            sudo \
+            unzip \
+            apt-transport-https \
+            ca-certificates \
+            curl \
+            software-properties-common \
+            gnupg2 \
+            libc6 \
+            build-essential
+RUN mkdir -p /usr/share/keyrings/
 
 # Docker
-RUN curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add -
-RUN sudo apt-key fingerprint 0EBFCD88
-RUN  sudo add-apt-repository \
-   "deb [arch=amd64] https://download.docker.com/linux/debian \
-   stretch \
-   stable"
-RUN sudo apt-get update
-RUN sudo apt-get install -y -qq docker-ce docker-ce-cli containerd.io
+RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker.gpg] https://download.docker.com/linux/debian bookworm stable" | tee -a /etc/apt/sources.list.d/docker.list \
+ && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker.gpg \
+ && apt-get update -y \ 
+ && apt-get install -y -qq \
+            docker-ce \
+            docker-ce-cli \
+            containerd.io
 
 # Cloud SDK
-RUN export CLOUD_SDK_REPO="cloud-sdk-stretch" && \
-    echo "deb http://packages.cloud.google.com/apt $CLOUD_SDK_REPO main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \
-    curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \
-    apt-get update -y && apt-get install google-cloud-sdk google-cloud-sdk-app-engine-go -y -qq && \
-    sudo apt-get update -y && \
-    sudo apt-get install -y google-cloud-sdk-gke-gcloud-auth-plugin
+RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list \
+ && curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - \
+ && apt-get update -y \
+ && apt-get install -y -qq \
+            google-cloud-cli \
+            google-cloud-sdk-gke-gcloud-auth-plugin
 
 # Install Golang
-# https://github.com/docker-library/golang/blob/master/1.14/stretch/Dockerfile
 RUN mkdir -p /toolchain/golang
 WORKDIR /toolchain/golang
-RUN sudo rm -rf /usr/local/go/
+RUN rm -rf /usr/local/go/
 
 # When updating Go version, update Dockerfile.ci, Dockerfile.base-build, and go.mod
-RUN curl -L https://golang.org/dl/go1.19.5.linux-amd64.tar.gz | sudo tar -C /usr/local -xz
-
-ENV GOPATH /go
-ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
-
-RUN sudo mkdir -p "$GOPATH/src" "$GOPATH/bin" \
-  && sudo chmod -R 777 "$GOPATH"
-
-# Prepare toolchain and workspace
-RUN mkdir -p /toolchain
+# reference: https://github.com/docker-library/golang/blob/master/1.20/bookworm/Dockerfile
+RUN curl -L https://golang.org/dl/go1.21.0.linux-amd64.tar.gz | tar -C /usr/local -xz
+RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" \
+ && chmod -R 777 "$GOPATH"
 
+# Prepare toolchain, workspace, homedir
+RUN mkdir -p \
+    /toolchain \
+    /workspace \
+    $HOME/.kube/
 WORKDIR /workspace
-ENV OPEN_MATCH_CI_MODE=1
-ENV KUBECONFIG=$HOME/.kube/config
-RUN mkdir -p $HOME/.kube/