From 7204bd7f441ff422ab39d2a6d8b01750db796a50 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Thu, 5 Sep 2019 12:06:11 +0200 Subject: [PATCH] Update files for new ocis naming --- .github/settings.yml | 4 ++-- Makefile | 2 +- README.md | 20 ++++++++++---------- changelog/TEMPLATE | 4 ++-- changelog/unreleased/initial-release.md | 2 +- cmd/{reva-ocs => ocis-ocs}/main.go | 2 +- docker/Dockerfile.linux.amd64 | 4 ++-- docker/Dockerfile.linux.arm | 4 ++-- docker/Dockerfile.linux.arm64 | 4 ++-- docker/manifest.tmpl | 8 ++++---- go.mod | 2 +- pkg/command/command.go | 12 ++++++------ 12 files changed, 34 insertions(+), 34 deletions(-) rename cmd/{reva-ocs => ocis-ocs}/main.go (72%) diff --git a/.github/settings.yml b/.github/settings.yml index 1356af515..871565893 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -1,6 +1,6 @@ repository: - name: reva-ocs - description: :atom_symbol: Service to serve ocs for reva + name: ocis-ocs + description: :atom_symbol: Service to serve OCS for Reva/oCIS homepage: topics: reva, ocis diff --git a/Makefile b/Makefile index e55da4968..362fa4c58 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ SHELL := bash -NAME := reva-ocs +NAME := ocis-ocs IMPORT := github.com/owncloud/$(NAME) BIN := bin DIST := dist diff --git a/README.md b/README.md index 18b29b6e2..4f2026706 100644 --- a/README.md +++ b/README.md @@ -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) -[![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) -[![Go Doc](https://godoc.org/github.com/owncloud/reva-ocs?status.svg)](http://godoc.org/github.com/owncloud/reva-ocs) -[![Go Report](http://goreportcard.com/badge/github.com/owncloud/reva-ocs)](http://goreportcard.com/report/github.com/owncloud/reva-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") +[![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/ocis-ocs?status.svg)](http://godoc.org/github.com/owncloud/ocis-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/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!** ## 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 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-ocs.git -cd reva-ocs +git clone https://github.com/owncloud/ocis-ocs.git +cd ocis-ocs make generate build -./bin/reva-ocs -h +./bin/ocis-ocs -h ``` ## Security diff --git a/changelog/TEMPLATE b/changelog/TEMPLATE index 3ec30fc8b..f25d3c083 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-ocs/issues/1234 -https://github.com/owncloud/reva-ocs/pull/55555 +https://github.com/owncloud/ocis-ocs/issues/1234 +https://github.com/owncloud/ocis-ocs/pull/55555 diff --git a/changelog/unreleased/initial-release.md b/changelog/unreleased/initial-release.md index 07fdc0e70..c03e50e01 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 OCS for the ownCloud Infinite Scale project. It just provides a minimal viable product to demonstrate the microservice pattern. -https://github.com/owncloud/reva-ocs/issues/1 +https://github.com/owncloud/ocis-ocs/issues/1 diff --git a/cmd/reva-ocs/main.go b/cmd/ocis-ocs/main.go similarity index 72% rename from cmd/reva-ocs/main.go rename to cmd/ocis-ocs/main.go index f6083ca3a..c1a332ff9 100644 --- a/cmd/reva-ocs/main.go +++ b/cmd/ocis-ocs/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/owncloud/reva-ocs/pkg/command" + "github.com/owncloud/ocis-ocs/pkg/command" ) func main() { diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64 index f5a3c6beb..a301421f8 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-ocs"] +ENTRYPOINT ["/usr/bin/ocis-ocs"] CMD ["server"] -COPY bin/reva-ocs /usr/bin/reva-ocs +COPY bin/ocis-ocs /usr/bin/ocis-ocs diff --git a/docker/Dockerfile.linux.arm b/docker/Dockerfile.linux.arm index 8bf0941f3..7c138c14c 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-ocs"] +ENTRYPOINT ["/usr/bin/ocis-ocs"] CMD ["server"] -COPY bin/reva-ocs /usr/bin/reva-ocs +COPY bin/ocis-ocs /usr/bin/ocis-ocs diff --git a/docker/Dockerfile.linux.arm64 b/docker/Dockerfile.linux.arm64 index 81fe62619..df642fe8b 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-ocs"] +ENTRYPOINT ["/usr/bin/ocis-ocs"] CMD ["server"] -COPY bin/reva-ocs /usr/bin/reva-ocs +COPY bin/ocis-ocs /usr/bin/ocis-ocs diff --git a/docker/manifest.tmpl b/docker/manifest.tmpl index 4e9284501..cdeae810b 100644 --- a/docker/manifest.tmpl +++ b/docker/manifest.tmpl @@ -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}} tags: {{#each build.tags}} @@ -6,16 +6,16 @@ tags: {{/each}} {{/if}} 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: architecture: amd64 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: architecture: arm64 variant: v8 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: architecture: arm variant: v6 diff --git a/go.mod b/go.mod index 027e16871..de1d35af1 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/owncloud/reva-ocs +module github.com/owncloud/ocis-ocs go 1.12 diff --git a/pkg/command/command.go b/pkg/command/command.go index 4f3751fd9..319203c69 100644 --- a/pkg/command/command.go +++ b/pkg/command/command.go @@ -4,17 +4,17 @@ import ( "os" "strings" - "github.com/owncloud/reva-ocs/pkg/version" + "github.com/owncloud/ocis-ocs/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-ocs command. +// Root is the entry point for the ocis-ocs command. func Root() *cobra.Command { cmd := &cobra.Command{ - Use: "reva-ocs", + Use: "ocis-ocs", Short: "Reva service for ocs", Long: ``, Version: version.String, @@ -74,10 +74,10 @@ func setupLogger() { } func setupConfig() { - viper.SetConfigName("phoenix") + viper.SetConfigName("ocs") - 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 {