diff --git a/.github/settings.yml b/.github/settings.yml index 77258000674..4ae6d57994d 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -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 diff --git a/Makefile b/Makefile index 6d0fa43edb1..58151d25f0f 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ SHELL := bash -NAME := reva-phoenix +NAME := ocis-phoenix IMPORT := github.com/owncloud/$(NAME) BIN := bin DIST := dist diff --git a/README.md b/README.md index 8cc7deb814c..2fec50c1b7d 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/changelog/TEMPLATE b/changelog/TEMPLATE index 633c30a4b5d..479f42b3b8f 100644 --- a/changelog/TEMPLATE +++ b/changelog/TEMPLATE @@ -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 diff --git a/changelog/unreleased/initial-release.md b/changelog/unreleased/initial-release.md index 8b45e1370df..cc5709b85b8 100644 --- a/changelog/unreleased/initial-release.md +++ b/changelog/unreleased/initial-release.md @@ -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 diff --git a/cmd/reva-phoenix/main.go b/cmd/ocis-phoenix/main.go similarity index 70% rename from cmd/reva-phoenix/main.go rename to cmd/ocis-phoenix/main.go index 1ae7c1c7117..07db4e89b69 100644 --- a/cmd/reva-phoenix/main.go +++ b/cmd/ocis-phoenix/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/owncloud/reva-phoenix/pkg/command" + "github.com/owncloud/ocis-phoenix/pkg/command" ) func main() { diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64 index f0eb46ade7a..37d985349bb 100644 --- a/docker/Dockerfile.linux.amd64 +++ b/docker/Dockerfile.linux.amd64 @@ -10,7 +10,7 @@ LABEL maintainer="ownCloud GmbH " \ 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 diff --git a/docker/Dockerfile.linux.arm b/docker/Dockerfile.linux.arm index 3ed7454b3dc..59cc28c9ac5 100644 --- a/docker/Dockerfile.linux.arm +++ b/docker/Dockerfile.linux.arm @@ -10,7 +10,7 @@ LABEL maintainer="ownCloud GmbH " \ 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 diff --git a/docker/Dockerfile.linux.arm64 b/docker/Dockerfile.linux.arm64 index 61da2a4e5a2..6644c93ee4d 100644 --- a/docker/Dockerfile.linux.arm64 +++ b/docker/Dockerfile.linux.arm64 @@ -10,7 +10,7 @@ LABEL maintainer="ownCloud GmbH " \ 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 diff --git a/docker/manifest.tmpl b/docker/manifest.tmpl index 85469058c08..0a8bf365d7c 100644 --- a/docker/manifest.tmpl +++ b/docker/manifest.tmpl @@ -1,4 +1,4 @@ -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}} @@ -6,16 +6,16 @@ tags: {{/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 diff --git a/go.mod b/go.mod index 0ffded88604..0a096293782 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/owncloud/reva-phoenix +module github.com/owncloud/ocis-phoenix go 1.12 diff --git a/pkg/command/command.go b/pkg/command/command.go index bcb936c98f8..7bd00cb965b 100644 --- a/pkg/command/command.go +++ b/pkg/command/command.go @@ -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, @@ -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 {