From ef8b959f243f31e400e9d6dc08fd009c4ae71a2a Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 20 Apr 2021 16:37:11 +0200 Subject: [PATCH] use binaries from make release --- .drone.star | 9 ++++++++- ocis/docker/Dockerfile.linux.amd64 | 2 +- ocis/docker/Dockerfile.linux.arm | 2 +- ocis/docker/Dockerfile.linux.arm64 | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.drone.star b/.drone.star index 767e8336e80..5bacd79ad62 100644 --- a/.drone.star +++ b/.drone.star @@ -709,7 +709,14 @@ def dockerRelease(ctx, arch): }, 'steps': makeGenerate('') + - build() + [ + { + 'name': 'build', + 'image': 'owncloudci/golang:1.16', + 'pull': 'always', + 'commands': [ + 'make -C ocis release-linux', + ], + }, { 'name': 'dryrun', 'image': 'plugins/docker:latest', diff --git a/ocis/docker/Dockerfile.linux.amd64 b/ocis/docker/Dockerfile.linux.amd64 index e8ad7b27184..7d85073130d 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 bin/ocis /usr/bin/ocis +COPY dist/binaries/ocis-testing-linux-amd64 /usr/bin/ocis VOLUME [ "/var/tmp/ocis" ] diff --git a/ocis/docker/Dockerfile.linux.arm b/ocis/docker/Dockerfile.linux.arm index 44b1606512e..d2909069355 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 bin/ocis /usr/bin/ocis +COPY dist/binaries/ocis-testing-linux-arm /usr/bin/ocis VOLUME [ "/var/tmp/ocis" ] diff --git a/ocis/docker/Dockerfile.linux.arm64 b/ocis/docker/Dockerfile.linux.arm64 index 6dd5cd7e6af..473211635fd 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 bin/ocis /usr/bin/ocis +COPY dist/binaries/ocis-testing-linux-arm64 /usr/bin/ocis VOLUME [ "/var/tmp/ocis" ]