Merge d14c9b5 into f3cd8c0

config/config.go

@@ -29,11 +29,12 @@ import (
 // AppConfig is the main config structure
 // export DIGOTA_LOCKER...=val
 type AppConfig struct {
-	TLS     TLS
-	Clients []Client
-	Payment []PaymentProvider
-	Storage Storage
-	Locker  Locker
+	TLS      TLS
+	Clients  []Client
+	Payment  []PaymentProvider
+	Storage  Storage
+	Locker   Locker
+	Insecure bool
 }
 
 // Client is the client config structure

docker/build/Dockerfile

@@ -0,0 +1,5 @@
+FROM golang:1.11
+
+RUN go get -u github.com/digota/digota
+
+CMD [ "digota" ]

docker/docker-compose.yml

@@ -0,0 +1,32 @@
+version: '3'
+services:
+
+  digota:
+    image: digota/digota:0.1
+    ports:
+     - 80:80
+    environment:
+      DIGOTA_INSECURE: true
+      DIGOTA_STORAGE_HANDLER: mongodb
+      DIGOTA_STORAGE_ADDRESS: mongodb:27017
+      DIGOTA_LOCKER_HANDLER: zookeeper
+      DIGOTA_LOCKER_ADDRESS: zookeeper:2181
+    depends_on: 
+      - zookeeper
+      - mongodb
+
+  zookeeper:
+    image: zookeeper
+    restart: unless-stopped
+    ports:
+      - 2181:2181
+    environment:
+      ZOO_MY_ID: 1
+      ZOO_SERVERS: server.1=0.0.0.0:2888:3888
+
+  mongodb:
+    image: mvertes/alpine-mongo:3.2.3
+    restart: unless-stopped
+    ports:
+      - "27017:27017"
+

main.go

@@ -67,9 +67,8 @@ const (
 )
 
 var (
-	app      = cli.NewApp()
-	addr     = port
-	insecure = false
+	app  = cli.NewApp()
+	addr = port
 )
 
 func init() {
@@ -100,11 +99,6 @@ func main() {
 			Value:       ":3051",
 			Destination: &addr,
 		},
-		cli.BoolFlag{
-			Name:        "insecure",
-			Usage:       "Skip auth and tls configurations",
-			Destination: &insecure,
-		},
 	}
 	// prepare things up
 	app.Action = func(c *cli.Context) error {
@@ -123,7 +117,7 @@ func main() {
 			log.Fatalf("Could not load config => %s", err.Error())
 		}
 		// create new server and run on port , Run() will block
-		server.New(addr, conf, insecure).Run()
+		server.New(addr, conf).Run()
 		return nil
 	}
 	// run with os.args

server/server.go

@@ -37,6 +37,12 @@ import (
 import (
 	"crypto/tls"
 	"crypto/x509"
+	"io/ioutil"
+	"net"
+	"os"
+	"os/signal"
+	"syscall"
+
 	"github.com/digota/digota/acl"
 	"github.com/digota/digota/client"
 	"github.com/digota/digota/config"
@@ -60,11 +66,6 @@ import (
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/reflection"
 	"google.golang.org/grpc/status"
-	"io/ioutil"
-	"net"
-	"os"
-	"os/signal"
-	"syscall"
 )
 
 type server struct {
@@ -73,9 +74,9 @@ type server struct {
 }
 
 // New create new digota server
-func New(addr string, conf *config.AppConfig, insecure bool) *server {
+func New(addr string, conf *config.AppConfig) *server {
 
-	if insecure {
+	if conf.Insecure {
 		acl.SetSkipAuth()
 	}