Merge pull request #1960 from owncloud/release-1.5.0

Merge back Release 1.5.0
2026-01-06 20:29:54 -06:00 · 2021-04-23 07:48:00 +02:00
parent 86e9369045 bedd4135e1
commit fc2f9bbe4b
17 changed files with 71 additions and 10 deletions
--- a/.drone.star
+++ b/.drone.star
@@ -714,7 +714,7 @@ def dockerRelease(ctx, arch):
        'image': 'owncloudci/golang:1.16',
        'pull': 'always',
        'commands': [
-          'make -C ocis release-linux',
+          'make -C ocis release-linux-docker',
        ],
      },
      {
--- a/.make/release.mk
+++ b/.make/release.mk
@@ -13,6 +13,9 @@ release-dirs:
 release-linux: $(GOX) release-dirs
 	$(GOX) -tags 'netgo $(TAGS)' -ldflags '-extldflags "-static" $(LDFLAGS)' -os 'linux' -arch 'amd64 386 arm64 arm' -output '$(DIST)/binaries/$(EXECUTABLE)-$(OUTPUT)-{{.OS}}-{{.Arch}}' ./cmd/$(NAME)

+release-linux-docker: $(GOX) release-dirs
+	$(GOX) -tags 'netgo $(TAGS)' -ldflags '-extldflags "-static" $(LDFLAGS)' -os 'linux' -arch 'amd64 386 arm64 arm' -output '$(DIST)/binaries/$(EXECUTABLE)-{{.OS}}-{{.Arch}}' ./cmd/$(NAME)
+
 .PHONY: release-windows
 release-windows: $(GOX) release-dirs
 	$(GOX) -tags 'netgo $(TAGS)' -ldflags '-extldflags "-static" $(LDFLAGS)' -os 'windows' -arch 'amd64' -output '$(DIST)/binaries/$(EXECUTABLE)-$(OUTPUT)-{{.OS}}-{{.Arch}}' ./cmd/$(NAME)
--- a/accounts/pkg/assets/embed.go
+++ b/accounts/pkg/assets/embed.go
--- a/changelog/1.5.0_2021-04-21/change-default-path-for-thumbnails.md
+++ b/changelog/1.5.0_2021-04-21/change-default-path-for-thumbnails.md
--- a/changelog/1.5.0_2021-04-21/config-parsing-run-subcommand.md
+++ b/changelog/1.5.0_2021-04-21/config-parsing-run-subcommand.md
--- a/changelog/1.5.0_2021-04-21/enhancement-update-ods-in-accounts-settings
+++ b/changelog/1.5.0_2021-04-21/enhancement-update-ods-in-accounts-settings
--- a/changelog/1.5.0_2021-04-21/fix-unaligned-atomic-operation-on-arm32.md
+++ b/changelog/1.5.0_2021-04-21/fix-unaligned-atomic-operation-on-arm32.md
--- a/changelog/1.5.0_2021-04-21/publicshares-sql-driver.md
+++ b/changelog/1.5.0_2021-04-21/publicshares-sql-driver.md
--- a/changelog/1.5.0_2021-04-21/remove-dead-runtime-code.md
+++ b/changelog/1.5.0_2021-04-21/remove-dead-runtime-code.md
--- a/changelog/1.5.0_2021-04-21/storage-registry-json.md
+++ b/changelog/1.5.0_2021-04-21/storage-registry-json.md
--- a/changelog/1.5.0_2021-04-21/unique-proto-package-names.md
+++ b/changelog/1.5.0_2021-04-21/unique-proto-package-names.md
--- a/changelog/1.5.0_2021-04-21/update-reva-to-a4b5148cbfb2.md
+++ b/changelog/1.5.0_2021-04-21/update-reva-to-a4b5148cbfb2.md
--- a/changelog/1.5.0_2021-04-21/update-web-3.0.0.md
+++ b/changelog/1.5.0_2021-04-21/update-web-3.0.0.md
--- a/ocis/docker/Dockerfile.linux.amd64
+++ b/ocis/docker/Dockerfile.linux.amd64
@@ -26,6 +26,6 @@ EXPOSE 9200/tcp
 ENTRYPOINT ["/usr/bin/ocis"]
 CMD ["server"]

-COPY dist/binaries/ocis-testing-linux-amd64 /usr/bin/ocis
+COPY dist/binaries/ocis-linux-amd64 /usr/bin/ocis

 VOLUME [ "/var/tmp/ocis" ]
--- a/ocis/docker/Dockerfile.linux.arm
+++ b/ocis/docker/Dockerfile.linux.arm
@@ -26,6 +26,6 @@ EXPOSE 9200/tcp
 ENTRYPOINT ["/usr/bin/ocis"]
 CMD ["server"]

-COPY dist/binaries/ocis-testing-linux-arm /usr/bin/ocis
+COPY dist/binaries/ocis-linux-arm /usr/bin/ocis

 VOLUME [ "/var/tmp/ocis" ]
--- a/ocis/docker/Dockerfile.linux.arm64
+++ b/ocis/docker/Dockerfile.linux.arm64
@@ -26,6 +26,6 @@ EXPOSE 9200/tcp
 ENTRYPOINT ["/usr/bin/ocis"]
 CMD ["server"]

-COPY dist/binaries/ocis-testing-linux-arm64 /usr/bin/ocis
+COPY dist/binaries/ocis-linux-arm64 /usr/bin/ocis

 VOLUME [ "/var/tmp/ocis" ]
--- a/settings/pkg/assets/embed.go
+++ b/settings/pkg/assets/embed.go