JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

travis: include win/darwin binaries in cross 

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
docker-19.03
Tonis Tiigi 2019-01-30 15:38:06 -08:00
parent 76be359fd1
commit aed586f558
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -12,7 +12,7 @@ env:
- PREFER_BUILDCTL="1" - PREFER_BUILDCTL="1"
script: script:
- make binaries validate-all && ./hack/cross - make binaries validate-all && PLATFORMS="${PLATFORMS},darwin/amd64,windows/amd64" ./hack/cross
before_deploy: before_deploy:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin

7
hack/dockerfiles/test.buildkit.Dockerfile
View File

@ -174,10 +174,15 @@ COPY --from=buildctl /usr/bin/buildctl /usr/bin/
ENTRYPOINT ["buildkitd.containerd_only"] ENTRYPOINT ["buildkitd.containerd_only"]
# Copy together all binaries for oci+containerd mode # Copy together all binaries for oci+containerd mode
FROM buildkit-export AS buildkit-buildkitd FROM buildkit-export AS buildkit-buildkitd-linux
COPY --from=binaries / /usr/bin/ COPY --from=binaries / /usr/bin/
ENTRYPOINT ["buildkitd"] ENTRYPOINT ["buildkitd"]
FROM binaries AS buildkit-buildkitd-darwin
FROM binaries AS buildkit-buildkitd-windows
FROM buildkit-buildkitd-$TARGETOS AS buildkit-buildkitd
FROM alpine AS containerd-runtime FROM alpine AS containerd-runtime
COPY --from=runc /usr/bin/runc /usr/bin/ COPY --from=runc /usr/bin/runc /usr/bin/
COPY --from=containerd /out/containerd* /usr/bin/ COPY --from=containerd /out/containerd* /usr/bin/