sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1941 from owncloud/fix_arm64_builds_docker

Browse Source 
use binaries from make release for docker builds
This commit is contained in:
Alex Unger
2021-04-21 11:40:05 +02:00
committed by GitHub
parent dff3f0afd1 0e36f04a62
commit a95cf437de
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.drone.star
+9 -2
View File
@@ -708,8 +708,15 @@ def dockerRelease(ctx, arch):
'arch': arch, 'arch': arch,
}, },
'steps': 'steps':
makeGenerate('') + makeGenerate('') + [
build() + [ {
'name': 'build',
'image': 'owncloudci/golang:1.16',
'pull': 'always',
'commands': [
'make -C ocis release-linux',
],
},
{ {
'name': 'dryrun', 'name': 'dryrun',
'image': 'plugins/docker:latest', 'image': 'plugins/docker:latest',
ocis/docker/Dockerfile.linux.amd64
+1 -1
View File
@@ -26,6 +26,6 @@ EXPOSE 9200/tcp
ENTRYPOINT ["/usr/bin/ocis"] ENTRYPOINT ["/usr/bin/ocis"]
CMD ["server"] CMD ["server"]
COPY bin/ocis /usr/bin/ocis COPY dist/binaries/ocis-testing-linux-amd64 /usr/bin/ocis
VOLUME [ "/var/tmp/ocis" ] VOLUME [ "/var/tmp/ocis" ]
ocis/docker/Dockerfile.linux.arm
+1 -1
View File
@@ -26,6 +26,6 @@ EXPOSE 9200/tcp
ENTRYPOINT ["/usr/bin/ocis"] ENTRYPOINT ["/usr/bin/ocis"]
CMD ["server"] CMD ["server"]
COPY bin/ocis /usr/bin/ocis COPY dist/binaries/ocis-testing-linux-arm /usr/bin/ocis
VOLUME [ "/var/tmp/ocis" ] VOLUME [ "/var/tmp/ocis" ]
ocis/docker/Dockerfile.linux.arm64
+1 -1
View File
@@ -26,6 +26,6 @@ EXPOSE 9200/tcp
ENTRYPOINT ["/usr/bin/ocis"] ENTRYPOINT ["/usr/bin/ocis"]
CMD ["server"] CMD ["server"]
COPY bin/ocis /usr/bin/ocis COPY dist/binaries/ocis-testing-linux-arm64 /usr/bin/ocis
VOLUME [ "/var/tmp/ocis" ] VOLUME [ "/var/tmp/ocis" ]