Skip to content

Commit

Permalink
Merge branch 'main' into devin/1733880428-update-cardinal-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
ezavada authored Jan 16, 2025
2 parents 67687dc + b9213ba commit 1aa781f
Show file tree
Hide file tree
Showing 52 changed files with 17,509 additions and 239 deletions.
12 changes: 10 additions & 2 deletions .github/workflows/release-nakama.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@ jobs:
type=semver,pattern={{version}},value=${{ steps.semver.outputs.tag }}
type=semver,pattern={{major}}.{{minor}},value=${{ steps.semver.outputs.tag }}
type=sha
- name: Prepare arm64 tags
id: arm64_tags
run: |
TAGS="${{ steps.meta.outputs.tags }}"
TAGS_ARM64="$(echo "$TAGS" | grep -v 'sha-' | sed 's/$/-arm64/g')"
echo "tags<<EOF" >> $GITHUB_OUTPUT
echo "$TAGS_ARM64" >> $GITHUB_OUTPUT
echo "EOF" >> $GITHUB_OUTPUT
- name: Build and push
uses: docker/build-push-action@v5
with:
Expand All @@ -70,5 +78,5 @@ jobs:
target: nakama-arm
platforms: linux/arm64
push: true
tags: ${{ steps.meta.outputs.tags }}-arm64
labels: ${{ steps.meta.outputs.labels }}
tags: ${{ steps.arm64_tags.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}-arm64
10 changes: 5 additions & 5 deletions cardinal/persona_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func TestPersonaTagIsValid(t *testing.T) {
}

func TestCreatePersonaTransactionAutomaticallyCreated(t *testing.T) {
// Verify that the cardinal.CreatePersona is automatically cardinal.Created and registered with a engine.
// Verify that the cardinal.CreatePersona is automatically cardinal.Created and registered with an engine.
tf := NewTestFixture(t, nil)
world := tf.World
tf.StartWorld()
Expand Down Expand Up @@ -125,7 +125,7 @@ func TestDuplicatePersonaTagsInTickAreOnlyRegisteredOnce(t *testing.T) {
}

func TestCreatePersonaFailsIfTagIsInvalid(t *testing.T) {
// Verify that the cardinal.CreatePersona is automatically cardinal.Created and registered with a engine.
// Verify that the cardinal.CreatePersona is automatically cardinal.Created and registered with an engine.
tf := NewTestFixture(t, nil)
world := tf.World
tf.StartWorld()
Expand All @@ -140,7 +140,7 @@ func TestCreatePersonaFailsIfTagIsInvalid(t *testing.T) {
}

func TestSamePersonaWithDifferentCaseCannotBeClaimed(t *testing.T) {
// Verify that the cardinal.CreatePersona is automatically cardinal.Created and registered with a engine.
// Verify that the cardinal.CreatePersona is automatically cardinal.Created and registered with an engine.
tf := NewTestFixture(t, nil)
world := tf.World
tf.StartWorld()
Expand All @@ -154,7 +154,7 @@ func TestSamePersonaWithDifferentCaseCannotBeClaimed(t *testing.T) {
}

func TestCanAuthorizeAddress(t *testing.T) {
// Verify that the cardinal.CreatePersona is automatically cardinal.Created and registered with a engine.
// Verify that the cardinal.CreatePersona is automatically cardinal.Created and registered with an engine.
tf := NewTestFixture(t, nil)
world := tf.World
tf.StartWorld()
Expand Down Expand Up @@ -192,7 +192,7 @@ func TestCanAuthorizeAddress(t *testing.T) {
}

func TestAuthorizeAddressFailsOnInvalidAddress(t *testing.T) {
// Verify that the cardinal.CreatePersona is automatically cardinal.Created and registered with a engine.
// Verify that the cardinal.CreatePersona is automatically cardinal.Created and registered with an engine.
tf := NewTestFixture(t, nil)
world := tf.World
tf.StartWorld()
Expand Down
2 changes: 1 addition & 1 deletion cardinal/receipt/receipt.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func (r Receipt) MarshalJSON() ([]byte, error) {
})
}

// NewHistory creates a object that can track transaction receipts over a number of ticks.
// NewHistory creates an object that can track transaction receipts over a number of ticks.
func NewHistory(currentTick uint64, ticksToStore int) *History {
// Add an extra tick for the "current" tick.
ticksToStore++
Expand Down
4 changes: 2 additions & 2 deletions cardinal/world_fixture.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ func (t *TestFixture) httpURL(path string) string {
return fmt.Sprintf("http://%s/%s", t.BaseURL, path)
}

// Post executes a http POST request to this TextFixture's cardinal server.
// Post executes an http POST request to this TextFixture's cardinal server.
func (t *TestFixture) Post(path string, payload any) *http.Response {
bz, err := json.Marshal(payload)
assert.NilError(t, err)
Expand All @@ -163,7 +163,7 @@ func (t *TestFixture) Post(path string, payload any) *http.Response {
return resp
}

// Get executes a http GET request to this TestFixture's cardinal server.
// Get executes an http GET request to this TestFixture's cardinal server.
func (t *TestFixture) Get(path string) *http.Response {
req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, t.httpURL(strings.Trim(path, "/")),
nil)
Expand Down
4 changes: 2 additions & 2 deletions docs/cardinal/game/cql.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Two functions are provided in the language that accept a variadic amount of comp

**Examples:**

- `CONTAINS(armComponent)` is a query for all entities that have a arm component. The entity can have more components than just the arm.
- `CONTAINS(armComponent)` is a query for all entities that have an arm component. The entity can have more components than just the arm.
- `CONTAINS(armComponent, legComponent)` is query for all entities that have both an arm component and a leg component. The entity can have more components than the arm and the leg.


Expand Down Expand Up @@ -92,4 +92,4 @@ You can use parenthesis to specify and change precedence in CQL.
- The above is a query for either an entity with only a leg component or an entity that does not have a health component and also does not have an attack component.

- Example: `(EXACT(legComponent) | !CONTAINS(healthComponent)) & !CONTAINS(attackComponent)`
- The above is the same query but with precedence changed. Now it is querying an entity with either exactly one leg component or does not have a health component. Additionally that entity must not ever contain a attack component.
- The above is the same query but with precedence changed. Now it is querying an entity with either exactly one leg component or does not have a health component. Additionally that entity must not ever contain an attack component.
30 changes: 30 additions & 0 deletions docs/cardinal/game/world/api-reference.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,36 @@ func TestGameSystem(t *testing.T) {
The WithTickDoneChannel is essential for writing deterministic tests. Always wait for the done signal before making assertions about game state changes.
</Tip>

#### WithMessageExpiration

The `WithMessageExpiration` option controls how long messages will live past their creation time on the sender before they are considered to be expired and will not be processed. Default is 10 seconds. For longer expiration times you may also need to set a larger hash cache size using the `WithHashCacheSize` option. This setting is ignored if the DisableSignatureVerification option is used. **NOTE**: this means that the real time clock for the sender and receiver must be synchronized

```go
func WithMessageExpiration(seconds uint) WorldOption
```

##### Parameters

| Parameter | Type | Description |
|-----------|--------|----------------------------------------------------------------|
| seconds | `uint` | How long messages live past their creation time on the sender. |

#### WithHashCacheSize

The `WithHashCacheSize` option sets how big (in kilobytes) the cache of hashes used for replay protection is allowed to be. Values less than 512 will be treated as 512 (512K cache size). Default is 1024 (1MB cache size). This setting is ignored if the DisableSignatureVerification option is used

```go
func WithHashCacheSize(sizeKB uint) WorldOption
```

##### Parameters

| Parameter | Type | Description |
|-----------|--------|----------------------------------------------------------------|
| sizeKB | `uint` | How big the cache for used hashes can be. Min value 512. |

## RegisterSystems

`RegisterSystems` registers one or more systems to the `World`. Systems are executed in the order of which they were added to the world.

```go
Expand Down
12 changes: 6 additions & 6 deletions docs/cardinal/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@
"required": [
"body",
"namespace",
"nonce",
"timestamp",
"personaTag",
"signature"
],
Expand All @@ -435,9 +435,9 @@
"type": "string",
"example": "agar-shooter"
},
"nonce": {
"timestamp": {
"type": "integer",
"format": "int64"
"format": "unix millisecond timestamp"
},
"signature": {
"type": "string"
Expand Down Expand Up @@ -539,7 +539,7 @@
"required": [
"body",
"namespace",
"nonce",
"timestamp",
"personaTag",
"signature"
],
Expand All @@ -553,9 +553,9 @@
"type": "string",
"example": "agar-shooter"
},
"nonce": {
"timestamp": {
"type": "integer",
"format": "int64"
"format": "unix millisecond timestamp"
},
"signature": {
"type": "string"
Expand Down
2 changes: 1 addition & 1 deletion evm/app/export.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func (app *App) ExportAppStateAndValidators(
func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []string) {
applyAllowedAddrs := false

// check if there is a allowed address list
// check if there is an allowed address list
if len(jailAllowedAddrs) > 0 {
applyAllowedAddrs = true
}
Expand Down
4 changes: 3 additions & 1 deletion go.work
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
go 1.22.7
go 1.23.3

toolchain go1.23.4

use (
assert
Expand Down
13 changes: 5 additions & 8 deletions go.work.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2108,8 +2108,6 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/gogo/status v1.1.0 h1:+eIkrewn5q6b30y+g/BJINVVdi2xH7je5MPJ3ZPK3JA=
github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM=
github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA=
Expand All @@ -2136,6 +2134,7 @@ github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt
github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk=
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
Expand Down Expand Up @@ -2181,8 +2180,10 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-containerregistry v0.13.0 h1:y1C7Z3e149OJbOPDBxLYR8ITPz8dTKqQwjErKVHJC8k=
github.com/google/go-containerregistry v0.13.0/go.mod h1:J9FQ+eSS4a1aC2GNZxvNpbWhgp0487v+cgiilB4FqDo=
github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
Expand Down Expand Up @@ -2371,6 +2372,7 @@ github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150 h1:vlNjIqmUZ9CMAWsbURY
github.com/hydrogen18/memlistener v0.0.0-20141126152155-54553eb933fb/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE=
github.com/hydrogen18/memlistener v1.0.0 h1:JR7eDj8HD6eXrc5fWLbSUnfcQFL06PYvCc0DKQnWfaU=
github.com/hydrogen18/memlistener v1.0.0/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE=
github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
Expand Down Expand Up @@ -3542,7 +3544,6 @@ golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq
golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
Expand Down Expand Up @@ -3761,7 +3762,6 @@ golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2 h1:IRJeR9r1pYWsHKTRe/IInb7lYvbBVIqOgsX/u0mbOWY=
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0=
Expand Down Expand Up @@ -4049,7 +4049,6 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8/go.
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo=
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:qpvKtACPCQhAdu3PyQgV4l3LMXZEtft7y8QcarRsp9I=
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38/go.mod h1:vuAjtvlwkDKF6L1GQ0SokiRLCGFfeBUXWr/aFFkHACc=
google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697/go.mod h1:+D9ySVjN8nY8YCVjc5O7PZDIdZporIDY3KaGfJunh88=
google.golang.org/genproto/googleapis/bytestream v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:ylj+BE99M198VPbBh6A8d9n3w8fChvyLK3wwBOjXBFA=
google.golang.org/genproto/googleapis/bytestream v0.0.0-20230807174057-1744710a1577/go.mod h1:NjCQG/D8JandXxM57PZbAJL1DCNL6EypA0vPPwfsc7c=
google.golang.org/genproto/googleapis/bytestream v0.0.0-20231030173426-d783a09b4405/go.mod h1:GRUCuLdzVqZte8+Dl/D4N25yLzcGqqWaYkeVOwulFqw=
Expand Down Expand Up @@ -4099,7 +4098,6 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.
google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
google.golang.org/genproto/googleapis/rpc v0.0.0-20241206012308-a4fef0638583/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
google.golang.org/grpc v0.0.0-20170208002647-2a6bf6142e96/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
google.golang.org/grpc v1.6.0 h1:vaySXtNtPrLJFCiET8QXtfBrqq16ynklmFGaZwLcd1M=
Expand All @@ -4126,9 +4124,9 @@ google.golang.org/grpc v1.63.0/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDom
google.golang.org/grpc v1.64.1/go.mod h1:hiQF4LFZelK2WKaP6W0L92zGHtiQdZxk8CrSdvyjeP0=
google.golang.org/grpc v1.66.0/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 h1:M1YKkFIboKNieVO5DLUEVzQfGwJD30Nv2jfUgzb5UcE=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
Expand Down Expand Up @@ -4285,7 +4283,6 @@ mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d/go.mod h1:IeHQjmn6TOD+e4Z3RF
nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
nullprogram.com/x/optparse v1.0.0 h1:xGFgVi5ZaWOnYdac2foDT3vg0ZZC9ErXFV57mr4OHrI=
nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
pkg.world.dev/world-engine/sign v1.1.1/go.mod h1:/8iwRZIKQpVtjU/8s71ueOzIz5230GICF0z1ihu4uq0=
rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/pdf v0.1.1 h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4=
Expand Down
10 changes: 5 additions & 5 deletions relay/nakama/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM heroiclabs/nakama-pluginbuilder:3.22.0 AS builder
FROM heroiclabs/nakama-pluginbuilder:3.25.0 AS builder

ENV GO111MODULE on
ENV CGO_ENABLED 1
Expand All @@ -12,7 +12,7 @@ RUN go mod download

RUN go build --trimpath --buildmode=plugin -o ./plugin.so

FROM heroiclabs/nakama-pluginbuilder:3.22.0-arm AS builder-arm
FROM heroiclabs/nakama-pluginbuilder:3.25.0-arm AS builder-arm

ENV GO111MODULE on
ENV CGO_ENABLED 1
Expand All @@ -26,7 +26,7 @@ RUN go mod download

RUN go build --trimpath --buildmode=plugin -o ./plugin.so

FROM heroiclabs/nakama:3.22.0 AS nakama
FROM heroiclabs/nakama:3.25.0 AS nakama

RUN apt-get -y update && \
apt-get -y install --no-install-recommends curl && \
Expand All @@ -35,7 +35,7 @@ RUN apt-get -y update && \
COPY --from=builder /nakama/plugin/plugin.so /nakama/data/modules/
COPY relay/nakama/local.yml /nakama/data/

FROM heroiclabs/nakama:3.22.0-arm AS nakama-arm
FROM heroiclabs/nakama:3.25.0-arm AS nakama-arm

COPY --from=builder-arm /nakama/plugin/plugin.so /nakama/data/modules/
COPY relay/nakama/local.yml /nakama/data/
COPY relay/nakama/local.yml /nakama/data/
Loading

0 comments on commit 1aa781f

Please sign in to comment.