Skip to content

Commit

Permalink
Merge pull request #6 from owncloud/repo-rename
Browse files Browse the repository at this point in the history
Update files for new ocis naming
  • Loading branch information
tboerger authored Sep 5, 2019
2 parents a428f13 + 6311fa3 commit daaf1e6
Show file tree
Hide file tree
Showing 12 changed files with 33 additions and 33 deletions.
4 changes: 2 additions & 2 deletions .github/settings.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repository:
name: reva-phoenix
description: :atom_symbol: Service to serve phoenix for reva
name: ocis-phoenix
description: :atom_symbol: Service to serve Phoenix for Reva/oCIS
homepage:
topics: reva, ocis

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SHELL := bash
NAME := reva-phoenix
NAME := ocis-phoenix
IMPORT := github.com/owncloud/$(NAME)
BIN := bin
DIST := dist
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
# Reva: Phoenix
# ownCloud Infinit Scale: Phoenix

[![Build Status](https://cloud.drone.io/api/badges/owncloud/reva-phoenix/status.svg)](https://cloud.drone.io/owncloud/reva-phoenix)
[![Build Status](https://cloud.drone.io/api/badges/owncloud/ocis-phoenix/status.svg)](https://cloud.drone.io/owncloud/ocis-phoenix)
[![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-phoenix?utm_source=github.com&utm_medium=referral&utm_content=owncloud/reva-phoenix&utm_campaign=Badge_Grade)
[![Go Doc](https://godoc.org/github.com/owncloud/reva-phoenix?status.svg)](http://godoc.org/github.com/owncloud/reva-phoenix)
[![Go Report](http://goreportcard.com/badge/github.com/owncloud/reva-phoenix)](http://goreportcard.com/report/github.com/owncloud/reva-phoenix)
[![](https://images.microbadger.com/badges/image/owncloud/reva-phoenix.svg)](http://microbadger.com/images/owncloud/reva-phoenix "Get your own image badge on microbadger.com")
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/afe89eb0894848c5b67dc0343afd1df9)](https://www.codacy.com/app/owncloud/ocis-phoenix?utm_source=github.com&utm_medium=referral&utm_content=owncloud/ocis-phoenix&utm_campaign=Badge_Grade)
[![Go Doc](https://godoc.org/github.com/owncloud/ocis-phoenix?status.svg)](http://godoc.org/github.com/owncloud/ocis-phoenix)
[![Go Report](http://goreportcard.com/badge/github.com/owncloud/ocis-phoenix)](http://goreportcard.com/report/github.com/owncloud/ocis-phoenix)
[![](https://images.microbadger.com/badges/image/owncloud/ocis-phoenix.svg)](http://microbadger.com/images/owncloud/ocis-phoenix "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/phoenix/).
You can download prebuilt binaries from the GitHub releases or from our [download mirrors](http://download.owncloud.com/ocis/phoenix/).

## 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-phoenix.git
cd reva-phoenix
git clone https://github.com/owncloud/ocis-phoenix.git
cd ocis-phoenix

make generate build

./bin/reva-phoenix -h
./bin/ocis-phoenix -h
```

## Security
Expand Down
4 changes: 2 additions & 2 deletions changelog/TEMPLATE
Original file line number Diff line number Diff line change
Expand Up @@ -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-phoenix/issues/1234
https://github.com/owncloud/reva-phoenix/pull/55555
https://github.com/owncloud/ocis-phoenix/issues/1234
https://github.com/owncloud/ocis-phoenix/pull/55555
2 changes: 1 addition & 1 deletion changelog/unreleased/initial-release.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ Just prepared an initial basic version to serve Phoenix for the ownCloud
Infinite Scale project. It just provides a minimal viable product to
demonstrate the microservice pattern.

https://github.com/owncloud/reva-phoenix/issues/3
https://github.com/owncloud/ocis-phoenix/issues/3
2 changes: 1 addition & 1 deletion cmd/reva-phoenix/main.go → cmd/ocis-phoenix/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"os"

"github.com/owncloud/reva-phoenix/pkg/command"
"github.com/owncloud/ocis-phoenix/pkg/command"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.linux.amd64
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ LABEL maintainer="ownCloud GmbH <[email protected]>" \
org.label-schema.vendor="ownCloud GmbH" \
org.label-schema.schema-version="1.0"

ENTRYPOINT ["/usr/bin/reva-phoenix"]
ENTRYPOINT ["/usr/bin/ocis-phoenix"]
CMD ["server"]

COPY bin/reva-phoenix /usr/bin/reva-phoenix
COPY bin/ocis-phoenix /usr/bin/ocis-phoenix
4 changes: 2 additions & 2 deletions docker/Dockerfile.linux.arm
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ LABEL maintainer="ownCloud GmbH <[email protected]>" \
org.label-schema.vendor="ownCloud GmbH" \
org.label-schema.schema-version="1.0"

ENTRYPOINT ["/usr/bin/reva-phoenix"]
ENTRYPOINT ["/usr/bin/ocis-phoenix"]
CMD ["server"]

COPY bin/reva-phoenix /usr/bin/reva-phoenix
COPY bin/ocis-phoenix /usr/bin/ocis-phoenix
4 changes: 2 additions & 2 deletions docker/Dockerfile.linux.arm64
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ LABEL maintainer="ownCloud GmbH <[email protected]>" \
org.label-schema.vendor="ownCloud GmbH" \
org.label-schema.schema-version="1.0"

ENTRYPOINT ["/usr/bin/reva-phoenix"]
ENTRYPOINT ["/usr/bin/ocis-phoenix"]
CMD ["server"]

COPY bin/reva-phoenix /usr/bin/reva-phoenix
COPY bin/ocis-phoenix /usr/bin/ocis-phoenix
8 changes: 4 additions & 4 deletions docker/manifest.tmpl
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
image: owncloud/reva-phoenix:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
image: owncloud/ocis-phoenix:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
{{#if build.tags}}
tags:
{{#each build.tags}}
- {{this}}
{{/each}}
{{/if}}
manifests:
- image: owncloud/reva-phoenix:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
- image: owncloud/ocis-phoenix:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
platform:
architecture: amd64
os: linux
- image: owncloud/reva-phoenix:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
- image: owncloud/ocis-phoenix:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
platform:
architecture: arm64
variant: v8
os: linux
- image: owncloud/reva-phoenix:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
- image: owncloud/ocis-phoenix:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
platform:
architecture: arm
variant: v6
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/owncloud/reva-phoenix
module github.com/owncloud/ocis-phoenix

go 1.12

Expand Down
10 changes: 5 additions & 5 deletions pkg/command/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ import (
"os"
"strings"

"github.com/owncloud/reva-phoenix/pkg/version"
"github.com/owncloud/ocis-phoenix/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-phoenix",
Use: "ocis-phoenix",
Short: "Reva service for phoenix",
Long: ``,
Version: version.String,
Expand Down Expand Up @@ -76,8 +76,8 @@ func setupLogger() {
func setupConfig() {
viper.SetConfigName("phoenix")

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 {
Expand Down

0 comments on commit daaf1e6

Please sign in to comment.