Merge pull request #1960 from owncloud/release-1.5.0

Merge back Release 1.5.0

.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',
         ],
       },
       {

.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)

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" ]

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" ]

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" ]