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

Update files for new ocis naming

Browse Source
This commit is contained in:
Thomas Boerger
2019-09-05 12:06:11 +02:00
parent b00040ebbc
commit 7204bd7f44
12 changed files with 34 additions and 34 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: repository:
name: reva-ocs name: ocis-ocs
description: :atom_symbol: Service to serve ocs for reva description: :atom_symbol: Service to serve OCS for Reva/oCIS
homepage: homepage:
topics: reva, ocis topics: reva, ocis
Makefile
+1 -1
View File
@@ -1,5 +1,5 @@
SHELL := bash SHELL := bash
NAME := reva-ocs NAME := ocis-ocs
IMPORT := github.com/owncloud/$(NAME) IMPORT := github.com/owncloud/$(NAME)
BIN := bin BIN := bin
DIST := dist DIST := dist
README.md
+10 -10
View File
@@ -1,29 +1,29 @@
# Reva: OCS # ownCloud Infinit Scale: OCS
[![Build Status](https://cloud.drone.io/api/badges/owncloud/reva-ocs/status.svg)](https://cloud.drone.io/owncloud/reva-ocs) [![Build Status](https://cloud.drone.io/api/badges/owncloud/ocis-ocs/status.svg)](https://cloud.drone.io/owncloud/ocis-ocs)
[![Gitter chat](https://badges.gitter.im/cs3org/reva.svg)](https://gitter.im/cs3org/reva) [![Gitter chat](https://badges.gitter.im/cs3org/reva.svg)](https://gitter.im/cs3org/reva)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/afe89eb0894848c5b67dc0343afd1df9)](https://www.codacy.com/app/owncloud/reva-ocs?utm_source=github.com&utm_medium=referral&utm_content=owncloud/reva-ocs&utm_campaign=Badge_Grade) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/80a22dcfa3cb4f09ba8f63b386683d16)](https://www.codacy.com/app/owncloud/ocis-ocs?utm_source=github.com&utm_medium=referral&utm_content=owncloud/ocis-ocs&utm_campaign=Badge_Grade)
[![Go Doc](https://godoc.org/github.com/owncloud/reva-ocs?status.svg)](http://godoc.org/github.com/owncloud/reva-ocs) [![Go Doc](https://godoc.org/github.com/owncloud/ocis-ocs?status.svg)](http://godoc.org/github.com/owncloud/ocis-ocs)
[![Go Report](http://goreportcard.com/badge/github.com/owncloud/reva-ocs)](http://goreportcard.com/report/github.com/owncloud/reva-ocs) [![Go Report](http://goreportcard.com/badge/github.com/owncloud/ocis-ocs)](http://goreportcard.com/report/github.com/owncloud/ocis-ocs)
[![](https://images.microbadger.com/badges/image/owncloud/reva-ocs.svg)](http://microbadger.com/images/owncloud/reva-ocs "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/image/owncloud/ocis-ocs.svg)](http://microbadger.com/images/owncloud/ocis-ocs "Get your own image badge on microbadger.com")
**This project is under heavy development, it's not in a working state yet!** **This project is under heavy development, it's not in a working state yet!**
## Install ## Install
You can download prebuilt binaries from the GitHub releases or from our [download mirrors](http://download.owncloud.com/reva/ocs/). You can download prebuilt binaries from the GitHub releases or from our [download mirrors](http://download.owncloud.com/ocis/ocs/).
## Development ## 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. 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 ```console
git clone https://github.com/owncloud/reva-ocs.git git clone https://github.com/owncloud/ocis-ocs.git
cd reva-ocs cd ocis-ocs
make generate build make generate build
./bin/reva-ocs -h ./bin/ocis-ocs -h
``` ```
## Security ## 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, 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. in case there aren't any issue links) is used as the primary ID.
https://github.com/owncloud/reva-ocs/issues/1234 https://github.com/owncloud/ocis-ocs/issues/1234
https://github.com/owncloud/reva-ocs/pull/55555 https://github.com/owncloud/ocis-ocs/pull/55555
changelog/unreleased/initial-release.md
+1 -1
View File
@@ -4,4 +4,4 @@ Just prepared an initial basic version to serve OCS for the ownCloud
Infinite Scale project. It just provides a minimal viable product to Infinite Scale project. It just provides a minimal viable product to
demonstrate the microservice pattern. demonstrate the microservice pattern.
https://github.com/owncloud/reva-ocs/issues/1 https://github.com/owncloud/ocis-ocs/issues/1
cmd/reva-ocs/main.go → cmd/ocis-ocs/main.go
+1 -1
View File
@@ -3,7 +3,7 @@ package main
import ( import (
"os" "os"
"github.com/owncloud/reva-ocs/pkg/command" "github.com/owncloud/ocis-ocs/pkg/command"
) )
func main() { 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.vendor="ownCloud GmbH" \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
ENTRYPOINT ["/usr/bin/reva-ocs"] ENTRYPOINT ["/usr/bin/ocis-ocs"]
CMD ["server"] CMD ["server"]
COPY bin/reva-ocs /usr/bin/reva-ocs COPY bin/ocis-ocs /usr/bin/ocis-ocs
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.vendor="ownCloud GmbH" \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
ENTRYPOINT ["/usr/bin/reva-ocs"] ENTRYPOINT ["/usr/bin/ocis-ocs"]
CMD ["server"] CMD ["server"]
COPY bin/reva-ocs /usr/bin/reva-ocs COPY bin/ocis-ocs /usr/bin/ocis-ocs
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.vendor="ownCloud GmbH" \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
ENTRYPOINT ["/usr/bin/reva-ocs"] ENTRYPOINT ["/usr/bin/ocis-ocs"]
CMD ["server"] CMD ["server"]
COPY bin/reva-ocs /usr/bin/reva-ocs COPY bin/ocis-ocs /usr/bin/ocis-ocs
docker/manifest.tmpl
+4 -4
View File
@@ -1,4 +1,4 @@
image: owncloud/reva-ocs:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} image: owncloud/ocis-ocs:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
{{#if build.tags}} {{#if build.tags}}
tags: tags:
{{#each build.tags}} {{#each build.tags}}
@@ -6,16 +6,16 @@ tags:
{{/each}} {{/each}}
{{/if}} {{/if}}
manifests: manifests:
- image: owncloud/reva-ocs:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 - image: owncloud/ocis-ocs:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
platform: platform:
architecture: amd64 architecture: amd64
os: linux os: linux
- image: owncloud/reva-ocs:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 - image: owncloud/ocis-ocs:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
platform: platform:
architecture: arm64 architecture: arm64
variant: v8 variant: v8
os: linux os: linux
- image: owncloud/reva-ocs:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm - image: owncloud/ocis-ocs:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
platform: platform:
architecture: arm architecture: arm
variant: v6 variant: v6
go.mod
+1 -1
View File
@@ -1,4 +1,4 @@
module github.com/owncloud/reva-ocs module github.com/owncloud/ocis-ocs
go 1.12 go 1.12
pkg/command/command.go
+6 -6
View File
@@ -4,17 +4,17 @@ import (
"os" "os"
"strings" "strings"
"github.com/owncloud/reva-ocs/pkg/version" "github.com/owncloud/ocis-ocs/pkg/version"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/spf13/viper" "github.com/spf13/viper"
) )
// Root is the entry point for the reva-ocs command. // Root is the entry point for the ocis-ocs command.
func Root() *cobra.Command { func Root() *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "reva-ocs", Use: "ocis-ocs",
Short: "Reva service for ocs", Short: "Reva service for ocs",
Long: ``, Long: ``,
Version: version.String, Version: version.String,
@@ -74,10 +74,10 @@ func setupLogger() {
} }
func setupConfig() { func setupConfig() {
viper.SetConfigName("phoenix") viper.SetConfigName("ocs")
viper.AddConfigPath("/etc/reva") viper.AddConfigPath("/etc/ocis")
viper.AddConfigPath("$HOME/.reva") viper.AddConfigPath("$HOME/.ocis")
viper.AddConfigPath("./config") viper.AddConfigPath("./config")
if err := viper.ReadInConfig(); err != nil { if err := viper.ReadInConfig(); err != nil {