Skip to content

Commit

Permalink
fix dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
autom8ter committed Dec 21, 2020
1 parent 9dc7a95 commit c203d8e
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.10.0
current_version = 0.10.1
commit = False
tag = False

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version := "0.10.0"
version := "0.10.1"

.DEFAULT_GOAL := help

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

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

` docker pull graphikdb/graphik:v0.10.0`
` docker pull graphikdb/graphik:v0.10.1`

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

Expand Down Expand Up @@ -775,7 +775,7 @@ add this docker-compose.yml to ${pwd}:
version: '3.7'
services:
graphik:
image: graphikdb/graphik:v0.10.0
image: graphikdb/graphik:v0.10.1
env_file:
- .env
ports:
Expand Down
12 changes: 9 additions & 3 deletions database/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ func (g *Graph) cacheConnectionRefs() error {
func (g *Graph) cacheIndexes() error {
return g.db.View(func(tx *bbolt.Tx) error {
return tx.Bucket(dbIndexes).ForEach(func(k, v []byte) error {
if k == nil || v == nil {
return nil
}
var i apipb.Index
var program cel.Program
var err error
Expand Down Expand Up @@ -103,17 +106,20 @@ func (g *Graph) rangeTypeValidators(fn func(a *typeValidator) bool) {
func (g *Graph) cacheAuthorizers() error {
return g.db.View(func(tx *bbolt.Tx) error {
return tx.Bucket(dbAuthorizers).ForEach(func(k, v []byte) error {
if v == nil {
if k == nil || v == nil {
return nil
}
var i apipb.Authorizer
var err error
if err := proto.Unmarshal(v, &i); err != nil {
return err
}
if i.GetExpression() == "" {
return nil
}
program, err := g.vm.Auth().Program(i.Expression)
if err != nil {
return err
return errors.Wrapf(err, "failed to cache auth expression: %s", i.GetName())
}
g.authorizers.Set(i.GetName(), &authorizer{
authorizer: &i,
Expand All @@ -127,7 +133,7 @@ func (g *Graph) cacheAuthorizers() error {
func (g *Graph) cacheTypeValidators() error {
return g.db.View(func(tx *bbolt.Tx) error {
return tx.Bucket(dbTypeValidators).ForEach(func(k, v []byte) error {
if v == nil {
if k == nil || v == nil {
return nil
}
var i apipb.TypeValidator
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.7'
services:
graphik:
image: graphikdb/graphik:v0.10.0
image: graphikdb/graphik:v0.10.1
env_file:
- .env
ports:
Expand Down
6 changes: 3 additions & 3 deletions gql/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,9 @@ func gqlTypeValidator(val *apipb.TypeValidator) *model.TypeValidator {

func gqlIndex(val *apipb.Index) *model.Index {
return &model.Index{
Name: val.GetName(),
Gtype: val.GetGtype(),
Expression: val.GetExpression(),
Name: val.GetName(),
Gtype: val.GetGtype(),
Expression: val.GetExpression(),
TargetConnections: val.GetConnections(),
TargetDocs: val.GetDocs(),
}
Expand Down
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package version

const Version = "0.10.0"
const Version = "0.10.1"

0 comments on commit c203d8e

Please sign in to comment.