Skip to content

Commit

Permalink
prepare release, bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
micbar committed Nov 29, 2022
1 parent e13217b commit 27b2a79
Show file tree
Hide file tree
Showing 204 changed files with 45 additions and 21 deletions.
5 changes: 0 additions & 5 deletions changelog/2.0.0_2022-11-25/mount-ids.md

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
34 changes: 34 additions & 0 deletions changelog/2.0.0_2022-11-30/mount-ids.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
Bugfix: Make storage users mount ids unique by default

The mount ID of the storage users provider needs to be unique by default. We made this value configurable and added it to ocis init to be sure that we have a random uuid v4. This is important for federated instances.

> **Warning**
>BREAKING Change: In order to make every ocis storage provider ID unique by default, we needed to use a random uuidv4 during ocis init. Existing installations need to set this value explicitly or ocis will terminate after the upgrade.
> To upgrade from 2.0.0-rc.1 to 2.0.0-rc.2, 2.0.0 or later you need to set `GATEWAY_STORAGE_USERS_MOUNT_ID` and `STORAGE_USERS_MOUNT_ID` to the same random uuidv4.
>
>You can also add
>```
>storage_users:
> mount_id: some-random-uuid
>gateway:
> storage_registry:
> storage_users_mount_id: some-random-uuid
>```
>to the ocis.yaml file which was created during initialisazion
>
>Changing the ID of the storage-users provider will change all
>- WebDAV Urls
>- FileIDs
>- SpaceIDs
>- Bookmarks
>- and will make all existing shares invalid.
>
>The Android, Web and iOS clients will continue to work without interruptions. The Desktop Client sync connections need to be deleted and recreated.
>Sorry for the inconvenience 😅
>
>WORKAROUND - Not Recommended: You can avoid this by setting
>`GATEWAY_STORAGE_USERS_MOUNT_ID=1284d238-aa92-42ce-bdc4-0b0000009157` and
>`STORAGE_USERS_MOUNT_ID=1284d238-aa92-42ce-bdc4-0b0000009157`
>But this will cause problems later when two ocis instances want to federate.
https://github.com/owncloud/ocis/pull/5091
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
15 changes: 5 additions & 10 deletions changelog/CHANGELOG.tmpl
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
{{ $allVersions := . }}
{{- range $index, $changes := . }}{{ with $changes -}}
{{ $version := .Version -}}
{{/* ocis beta program */ -}}
{{ if eq .Version "2.0.0" -}}
{{ $version = (printf "%v-%v" $version "rc.2") -}}
{{ end -}}
{{ if gt (len $allVersions) 1 -}}
# Changelog for [{{ $version }}] ({{ .Date }})
# Changelog for [{{ .Version }}] ({{ .Date }})

The following sections list the changes for {{ $version }}.
The following sections list the changes for {{ .Version}}.

{{/* creating version compare links */ -}}
{{ $next := add1 $index -}}
{{ if ne (len $allVersions) $next -}}
{{ $previousVersion := (index $allVersions $next).Version -}}
{{ if eq .Version "unreleased" -}}
[{{ $version }}]: https://github.com/owncloud/ocis/compare/v{{ $previousVersion }}...master
[{{ .Version}}]: https://github.com/owncloud/ocis/compare/v{{ $previousVersion }}...master

{{ else -}}
[{{ $version }}]: https://github.com/owncloud/ocis/compare/v{{ $previousVersion }}...v{{ $version }}
[{{ .Version}}]: https://github.com/owncloud/ocis/compare/v{{ $previousVersion }}...v{{ .Version}}

{{ end -}}
{{ end -}}
Expand All @@ -29,7 +24,7 @@ The following sections list the changes for {{ $version }}.

{{ end -}}
{{ else -}}
# Changes in {{ $version }}
# Changes in {{ .Version}}

{{ end -}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
env:
INSECURE: "false"
TRAEFIK_ACME_MAIL: wkloucek@owncloud.com
OCIS_DOCKER_TAG: 2.0.0-rc.2
OCIS_DOCKER_TAG: 2.0.0
OCIS_DOMAIN: ocis.ocis-keycloak.released.owncloud.works
KEYCLOAK_DOMAIN: keycloak.ocis-keycloak.released.owncloud.works
COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
env:
INSECURE: "false"
TRAEFIK_ACME_MAIL: wkloucek@owncloud.com
OCIS_DOCKER_TAG: 2.0.0-rc.2
OCIS_DOCKER_TAG: 2.0.0
OCIS_DOMAIN: ocis.ocis-ldap.released.owncloud.works
LDAP_MANAGER_DOMAIN: ldap.ocis-ldap.released.owncloud.works
COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
env:
INSECURE: "false"
TRAEFIK_ACME_MAIL: wkloucek@owncloud.com
OCIS_DOCKER_TAG: 2.0.0-rc.2
OCIS_DOCKER_TAG: 2.0.0
OCIS_DOMAIN: ocis.ocis-traefik.released.owncloud.works
DEMO_USERS: "true"
INBUCKET_DOMAIN: mail.ocis-traefik.released.owncloud.works
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
env:
INSECURE: "false"
TRAEFIK_ACME_MAIL: wkloucek@owncloud.com
OCIS_DOCKER_TAG: 2.0.0-rc.2
OCIS_DOCKER_TAG: 2.0.0
OCIS_DOMAIN: ocis.ocis-wopi.released.owncloud.works
WOPISERVER_DOMAIN: wopiserver.ocis-wopi.released.owncloud.works
COLLABORA_DOMAIN: collabora.ocis-wopi.released.owncloud.works
Expand Down
2 changes: 1 addition & 1 deletion ocis-pkg/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var (
// LatestTag is the latest released version plus the dev meta version.
// Will be overwritten by the release pipeline
// Needs a manual change for every tagged release
LatestTag = "2.0.0-rc.2+dev"
LatestTag = "2.0.0+dev"

// Date indicates the build date.
Date = time.Now().Format("20060102")
Expand Down
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
sonar.projectKey=owncloud_ocis
sonar.organization=owncloud-1
sonar.projectName=ocis
sonar.projectVersion=2.0.0-rc.2
sonar.projectVersion=2.0.0
sonar.host.url=https://sonarcloud.io

# =====================================================
Expand Down

0 comments on commit 27b2a79

Please sign in to comment.