partially fix simple build

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2020-03-31 08:22:34 +02:00
parent 404fd1e184
commit f584d12934
2 changed files with 22 additions and 23 deletions
+18 -16
View File
@@ -14,11 +14,23 @@ git clone https://github.com/owncloud/ocis.git
cd ocis
{{< / highlight >}}
All required tool besides Go itself and make are bundled or getting automatically installed within the `GOPATH`. All commands to build this project are part of our `Makefile`.
All required tools besides Go itself and make are bundled or getting automatically installed within the `GOPATH`. All commands to build this project are part of our `Makefile`. To build the `ocis` binary run:
## Simple Ocis
{{< highlight txt >}}
make generate
make build
{{< / highlight >}}
Building the simple ocis binary:
Finally, you should have the binary within the `bin/` folder now, give it a try with `./bin/ocis -h` to see all available options.
## Simple Ocis fo extonsions example
Currently, we are using a go build tag to allow building a more simple set of the binary. It was intended to let extension developers focus on only the necessary services.
{{< hint info >}}
While it the tag based simple build demonstrates how to use ocis as a framework for a micro service architecture, we may change to an approach that uses an explicit command to run only a subset of the services.
{{< / hint >}}
```console
TAGS=simple make build
@@ -28,20 +40,10 @@ The artifact lives in `/bin/ocis`
The generated simple ocis binary is a subset of the ocis command with a restricted set of services meant for ease up development. The services included are
```
ocis-hello
phoenix
konnectd
devldap
ocis-phoenix
ocis-konnectd
ocis-glauth
micro's own services
```
## Backend
{{< highlight txt >}}
make generate
make build
{{< / highlight >}}
Finally you should have the binary within the `bin/` folder now, give it a try with `./bin/ocis -h` to see all available options.
+4 -7
View File
@@ -15,15 +15,12 @@ import (
)
var (
// SimpleRuntimeServices declares which services will be started for the fullstack server
// SimpleRuntimeServices declares which services will be started for the simple server
SimpleRuntimeServices = []string{
"hello",
"phoenix",
"reva-frontend",
"reva-gateway",
"reva-users",
"reva-auth-basic",
"reva-auth-bearer",
"konnectd",
"glauth",
}
)
@@ -50,7 +47,7 @@ func Simple(cfg *config.Config) *cli.Command {
runtime := runtime.New(
runtime.Logger(logger),
runtime.Services(append(runtime.RuntimeServices, SimpleRuntimeServices...)),
runtime.Services(append(runtime.MicroServices, SimpleRuntimeServices...)),
runtime.MicroRuntime(cmd.DefaultCmd.Options().Runtime),
runtime.Context(c),
)