Skip to content

Commit c203d8e

Browse files
committed
fix dockerfile
1 parent 9dc7a95 commit c203d8e

File tree

7 files changed

+18
-12
lines changed

7 files changed

+18
-12
lines changed

.bumpversion.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.10.0
2+
current_version = 0.10.1
33
commit = False
44
tag = False
55

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version := "0.10.0"
1+
version := "0.10.1"
22

33
.DEFAULT_GOAL := help
44

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
git clone git@github.com:graphikDB/graphik.git
77

8-
` docker pull graphikdb/graphik:v0.10.0`
8+
` docker pull graphikdb/graphik:v0.10.1`
99

1010
Graphik is a Backend as a Service implemented as an identity-aware, permissioned, persistant document/graph database & pubsub server written in Go.
1111

@@ -775,7 +775,7 @@ add this docker-compose.yml to ${pwd}:
775775
version: '3.7'
776776
services:
777777
graphik:
778-
image: graphikdb/graphik:v0.10.0
778+
image: graphikdb/graphik:v0.10.1
779779
env_file:
780780
- .env
781781
ports:

database/db.go

+9-3
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ func (g *Graph) cacheConnectionRefs() error {
6161
func (g *Graph) cacheIndexes() error {
6262
return g.db.View(func(tx *bbolt.Tx) error {
6363
return tx.Bucket(dbIndexes).ForEach(func(k, v []byte) error {
64+
if k == nil || v == nil {
65+
return nil
66+
}
6467
var i apipb.Index
6568
var program cel.Program
6669
var err error
@@ -103,17 +106,20 @@ func (g *Graph) rangeTypeValidators(fn func(a *typeValidator) bool) {
103106
func (g *Graph) cacheAuthorizers() error {
104107
return g.db.View(func(tx *bbolt.Tx) error {
105108
return tx.Bucket(dbAuthorizers).ForEach(func(k, v []byte) error {
106-
if v == nil {
109+
if k == nil || v == nil {
107110
return nil
108111
}
109112
var i apipb.Authorizer
110113
var err error
111114
if err := proto.Unmarshal(v, &i); err != nil {
112115
return err
113116
}
117+
if i.GetExpression() == "" {
118+
return nil
119+
}
114120
program, err := g.vm.Auth().Program(i.Expression)
115121
if err != nil {
116-
return err
122+
return errors.Wrapf(err, "failed to cache auth expression: %s", i.GetName())
117123
}
118124
g.authorizers.Set(i.GetName(), &authorizer{
119125
authorizer: &i,
@@ -127,7 +133,7 @@ func (g *Graph) cacheAuthorizers() error {
127133
func (g *Graph) cacheTypeValidators() error {
128134
return g.db.View(func(tx *bbolt.Tx) error {
129135
return tx.Bucket(dbTypeValidators).ForEach(func(k, v []byte) error {
130-
if v == nil {
136+
if k == nil || v == nil {
131137
return nil
132138
}
133139
var i apipb.TypeValidator

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3.7'
22
services:
33
graphik:
4-
image: graphikdb/graphik:v0.10.0
4+
image: graphikdb/graphik:v0.10.1
55
env_file:
66
- .env
77
ports:

gql/helpers.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,9 @@ func gqlTypeValidator(val *apipb.TypeValidator) *model.TypeValidator {
222222

223223
func gqlIndex(val *apipb.Index) *model.Index {
224224
return &model.Index{
225-
Name: val.GetName(),
226-
Gtype: val.GetGtype(),
227-
Expression: val.GetExpression(),
225+
Name: val.GetName(),
226+
Gtype: val.GetGtype(),
227+
Expression: val.GetExpression(),
228228
TargetConnections: val.GetConnections(),
229229
TargetDocs: val.GetDocs(),
230230
}

version/version.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
package version
22

3-
const Version = "0.10.0"
3+
const Version = "0.10.1"

0 commit comments

Comments
 (0)