From c9344cf2792ec2f36277f67baf94aa91ae13ad60 Mon Sep 17 00:00:00 2001
From: Willy Kloucek <wkloucek@owncloud.com>
Date: Thu, 22 Apr 2021 08:49:55 +0200
Subject: [PATCH] fix docker release

---
 .drone.star                        | 2 +-
 .make/release.mk                   | 3 +++
 ocis/docker/Dockerfile.linux.amd64 | 2 +-
 ocis/docker/Dockerfile.linux.arm   | 2 +-
 ocis/docker/Dockerfile.linux.arm64 | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.drone.star b/.drone.star
index 5a675d19d8..532558c391 100644
--- 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',
         ],
       },
       {
diff --git a/.make/release.mk b/.make/release.mk
index 28874aeeaa..376b1a8440 100644
--- 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)
diff --git a/ocis/docker/Dockerfile.linux.amd64 b/ocis/docker/Dockerfile.linux.amd64
index 7d85073130..ce227da2d8 100644
--- 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" ]
diff --git a/ocis/docker/Dockerfile.linux.arm b/ocis/docker/Dockerfile.linux.arm
index d290906935..f0ddbb32ae 100644
--- 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" ]
diff --git a/ocis/docker/Dockerfile.linux.arm64 b/ocis/docker/Dockerfile.linux.arm64
index 473211635f..3e1f4f555f 100644
--- 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" ]