sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5 from owncloud/repo-rename

Browse Source 
Update files for new ocis naming
This commit is contained in:
Thomas Boerger
2019-09-05 13:32:55 +02:00
committed by GitHub
parent 251350ed1d e807f497bf
commit 7d04edb785
16 changed files with 75 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/settings.yml
+2 -2
View File
@@ -1,6 +1,6 @@
repository:
name: reva-hyper
description: :atom_symbol: Provide reva as single binary
name: ocis
description: :atom_symbol: ownCloud Infinit Scale stack
homepage:
topics: reva, ocis
Makefile
+1 -1
View File
@@ -1,5 +1,5 @@
SHELL := bash
NAME := reva-hyper
NAME := ocis
IMPORT := github.com/owncloud/$(NAME)
BIN := bin
DIST := dist
README.md
+10 -10
View File
@@ -1,29 +1,29 @@
# Reva: Hyper
# ownCloud Infinit Scale
[![Build Status](https://cloud.drone.io/api/badges/owncloud/reva-hyper/status.svg)](https://cloud.drone.io/owncloud/reva-hyper)
[![Build Status](https://cloud.drone.io/api/badges/owncloud/ocis/status.svg)](https://cloud.drone.io/owncloud/ocis)
[![Gitter chat](https://badges.gitter.im/cs3org/reva.svg)](https://gitter.im/cs3org/reva)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/dc97ddfa167641d8b107e9b618823c71)](https://www.codacy.com/app/owncloud/reva-hyper?utm_source=github.com&utm_medium=referral&utm_content=owncloud/reva-hyper&utm_campaign=Badge_Grade)
[![Go Doc](https://godoc.org/github.com/owncloud/reva-hyper?status.svg)](http://godoc.org/github.com/owncloud/reva-hyper)
[![Go Report](http://goreportcard.com/badge/github.com/owncloud/reva-hyper)](http://goreportcard.com/report/github.com/owncloud/reva-hyper)
[![](https://images.microbadger.com/badges/image/owncloud/reva-hyper.svg)](http://microbadger.com/images/owncloud/reva-hyper "Get your own image badge on microbadger.com")
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/dc97ddfa167641d8b107e9b618823c71)](https://www.codacy.com/app/owncloud/ocis?utm_source=github.com&utm_medium=referral&utm_content=owncloud/ocis&utm_campaign=Badge_Grade)
[![Go Doc](https://godoc.org/github.com/owncloud/ocis?status.svg)](http://godoc.org/github.com/owncloud/ocis)
[![Go Report](http://goreportcard.com/badge/github.com/owncloud/ocis)](http://goreportcard.com/report/github.com/owncloud/ocis)
[![](https://images.microbadger.com/badges/image/owncloud/ocis.svg)](http://microbadger.com/images/owncloud/ocis "Get your own image badge on microbadger.com")
**This project is under heavy development, it's not in a working state yet!**
## Install
You can download prebuilt binaries from the GitHub releases or from our [download mirrors](http://download.owncloud.com/reva/hyper/).
You can download prebuilt binaries from the GitHub releases or from our [download mirrors](http://download.owncloud.com/ocis/ocis/).
## Development
Make sure you have a working Go environment, for further reference or a guide take a look at the [install instructions](http://golang.org/doc/install.html). This project requires Go >= v1.11.
```console
git clone https://github.com/owncloud/reva-hyper.git
cd reva-hyper
git clone https://github.com/owncloud/ocis.git
cd ocis
make generate build
./bin/reva-hyper -h
./bin/ocis -h
```
## Security
changelog/TEMPLATE
+2 -2
View File
@@ -7,5 +7,5 @@ The text in the paragraphs is written in past tense. The last section is a list
of issue URLs, PR URLs and other URLs. The first issue ID (or the first PR ID,
in case there aren't any issue links) is used as the primary ID.
https://github.com/owncloud/reva-hyper/issues/1234
https://github.com/owncloud/reva-hyper/pull/55555
https://github.com/owncloud/ocis/issues/1234
https://github.com/owncloud/ocis/pull/55555
changelog/unreleased/initial-release.md
+1 -1
View File
@@ -3,4 +3,4 @@ Change: Initial release of basic version
Just prepared an initial basic version which simply embeds the minimum of
required services in the context of the ownCloud Infinite Scale project.
https://github.com/owncloud/reva-hyper/issues/2
https://github.com/owncloud/ocis/issues/2
cmd/reva-hyper/main.go → cmd/ocis/main.go
+1 -1
View File
@@ -3,7 +3,7 @@ package main
import (
"os"
"github.com/owncloud/reva-hyper/pkg/command"
"github.com/owncloud/ocis/pkg/command"
)
func main() {
docker/Dockerfile.linux.amd64
+2 -2
View File
@@ -10,7 +10,7 @@ LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
org.label-schema.vendor="ownCloud GmbH" \
org.label-schema.schema-version="1.0"
ENTRYPOINT ["/usr/bin/reva-hyper"]
ENTRYPOINT ["/usr/bin/ocis"]
CMD ["server"]
COPY bin/reva-hyper /usr/bin/reva-hyper
COPY bin/ocis /usr/bin/ocis
docker/Dockerfile.linux.arm
+2 -2
View File
@@ -10,7 +10,7 @@ LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
org.label-schema.vendor="ownCloud GmbH" \
org.label-schema.schema-version="1.0"
ENTRYPOINT ["/usr/bin/reva-hyper"]
ENTRYPOINT ["/usr/bin/ocis"]
CMD ["server"]
COPY bin/reva-hyper /usr/bin/reva-hyper
COPY bin/ocis /usr/bin/ocis
docker/Dockerfile.linux.arm64
+2 -2
View File
@@ -10,7 +10,7 @@ LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
org.label-schema.vendor="ownCloud GmbH" \
org.label-schema.schema-version="1.0"
ENTRYPOINT ["/usr/bin/reva-hyper"]
ENTRYPOINT ["/usr/bin/ocis"]
CMD ["server"]
COPY bin/reva-hyper /usr/bin/reva-hyper
COPY bin/ocis /usr/bin/ocis
docker/manifest.tmpl
+4 -4
View File
@@ -1,4 +1,4 @@
image: owncloud/reva-hyper:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
image: owncloud/ocis:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
{{#if build.tags}}
tags:
{{#each build.tags}}
@@ -6,16 +6,16 @@ tags:
{{/each}}
{{/if}}
manifests:
- image: owncloud/reva-hyper:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
- image: owncloud/ocis:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
platform:
architecture: amd64
os: linux
- image: owncloud/reva-hyper:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
- image: owncloud/ocis:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
platform:
architecture: arm64
variant: v8
os: linux
- image: owncloud/reva-hyper:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
- image: owncloud/ocis:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
platform:
architecture: arm
variant: v6
go.mod
+4 -4
View File
@@ -1,11 +1,11 @@
module github.com/owncloud/reva-hyper
module github.com/owncloud/ocis
go 1.12
require (
github.com/mitchellh/gox v1.0.1 // indirect
github.com/owncloud/reva-phoenix v0.0.0-20190904081830-66facde60aab
github.com/restic/calens v0.0.0-20190419101620-10f36cb4a529 // indirect
github.com/owncloud/ocis-ocs v0.0.0-20190905101159-0d7ed8b013a2
github.com/owncloud/ocis-phoenix v0.0.0-20190905101144-daaf1e6ddb5e
github.com/owncloud/ocis-webdav v0.0.0-20190905101156-4d74712e7d46
github.com/rs/zerolog v1.15.0
github.com/spf13/cobra v0.0.5
github.com/spf13/viper v1.4.0
go.sum
+6 -3
View File
@@ -69,8 +69,12 @@ github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQz
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
github.com/owncloud/reva-phoenix v0.0.0-20190904081830-66facde60aab h1:EnukxI1IQyXvQn8skaPSUCizsbOGVxHYc4N6IcES/38=
github.com/owncloud/reva-phoenix v0.0.0-20190904081830-66facde60aab/go.mod h1:KMSjvB329p95Ll2mEiLcu8DBV3FMMrxHcwMvv7rrPe4=
github.com/owncloud/ocis-ocs v0.0.0-20190905101159-0d7ed8b013a2 h1:jAvWtD0rLmJ2pq9i1GVNEFb9UbCZLUQljOyNhilFuGs=
github.com/owncloud/ocis-ocs v0.0.0-20190905101159-0d7ed8b013a2/go.mod h1:KqpOs72OzkwytfDulr5OpuUqb2MQjs9TV1of2H7cH70=
github.com/owncloud/ocis-phoenix v0.0.0-20190905101144-daaf1e6ddb5e h1:/OjMEYwI5B8RVnIGnS0W2WReECPkGG9CUJ1U2++V9yg=
github.com/owncloud/ocis-phoenix v0.0.0-20190905101144-daaf1e6ddb5e/go.mod h1:RtYBUWmccDT4I3qMU3Zt9CjO1e6NHHyXi7Pfypbcpo4=
github.com/owncloud/ocis-webdav v0.0.0-20190905101156-4d74712e7d46 h1:CMDPOqDyxjBOugqrpuEsSKMi7l78a0WEG68BuscdAGM=
github.com/owncloud/ocis-webdav v0.0.0-20190905101156-4d74712e7d46/go.mod h1:sq2p6BpRU8kklI7WgT2yUj2/IQXrJvPeBDMwHOmUuYA=
github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -85,7 +89,6 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
github.com/restic/calens v0.0.0-20190419101620-10f36cb4a529 h1:TPB3vbGNwppek0lcfpKG8rVRtvr5D78d/1MnlbfNfgA=
github.com/restic/calens v0.0.0-20190419101620-10f36cb4a529/go.mod h1:I3AyHROuWXtWtZtI5ApjLbnN0si15sWvPQO7ul4gDow=
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
pkg/command/command.go
+7 -5
View File
@@ -4,17 +4,17 @@ import (
"os"
"strings"
"github.com/owncloud/reva-hyper/pkg/version"
"github.com/owncloud/ocis/pkg/version"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
// Root is the entry point for the reva-phoenix command.
// Root is the entry point for the ocis-phoenix command.
func Root() *cobra.Command {
cmd := &cobra.Command{
Use: "reva-hyper",
Use: "ocis",
Short: "ownCloud infinite scale stack",
Long: ``,
Version: version.String,
@@ -40,6 +40,8 @@ func Root() *cobra.Command {
viper.BindEnv("log.color", "HYPER_LOG_COLOR")
cmd.AddCommand(Phoenix())
cmd.AddCommand(Webdav())
cmd.AddCommand(Ocs())
cmd.AddCommand(Health())
return cmd
@@ -76,8 +78,8 @@ func setupLogger() {
func setupConfig() {
viper.SetConfigName("hyper")
viper.AddConfigPath("/etc/reva")
viper.AddConfigPath("$HOME/.reva")
viper.AddConfigPath("/etc/ocis")
viper.AddConfigPath("$HOME/.ocis")
viper.AddConfigPath("./config")
if err := viper.ReadInConfig(); err != nil {
pkg/command/ocs.go
+15
View File
@@ -0,0 +1,15 @@
package command
import (
ocs "github.com/owncloud/ocis-ocs/pkg/command"
"github.com/spf13/cobra"
)
// Ocs is the entry point for the ocs command.
func Ocs() *cobra.Command {
cmd := ocs.Server()
cmd.Use = "ocs"
cmd.Short = "Start ocs server"
return cmd
}
pkg/command/phoenix.go
+1 -1
View File
@@ -1,7 +1,7 @@
package command
import (
phoenix "github.com/owncloud/reva-phoenix/pkg/command"
phoenix "github.com/owncloud/ocis-phoenix/pkg/command"
"github.com/spf13/cobra"
)
pkg/command/webdav.go
+15
View File
@@ -0,0 +1,15 @@
package command
import (
webdav "github.com/owncloud/ocis-webdav/pkg/command"
"github.com/spf13/cobra"
)
// Webdav is the entry point for the webdav command.
func Webdav() *cobra.Command {
cmd := webdav.Server()
cmd.Use = "webdav"
cmd.Short = "Start webdav server"
return cmd
}