diff options
| author | Erwin de Haan <EraYaN@users.noreply.github.com> | 2019-01-13 23:43:12 +0100 |
|---|---|---|
| committer | Erwin de Haan <EraYaN@users.noreply.github.com> | 2019-01-13 23:43:12 +0100 |
| commit | 9b224d7080d0dce986937229e9ff0c8923f7ce95 (patch) | |
| tree | dab3de4f51e8f09af50dcfd2e805156465dc2f1b /deployment/docker | |
| parent | ca320ba7acbd1018eba7816fac9271172e91ed1d (diff) | |
Merged the two ARM platforms. To be split apart when a binary ffmpeg is required.
Diffstat (limited to 'deployment/docker')
| -rwxr-xr-x | deployment/docker/build.sh | 5 | ||||
| -rwxr-xr-x | deployment/docker/package.sh | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/deployment/docker/build.sh b/deployment/docker/build.sh index 0f617ad094..444208c85c 100755 --- a/deployment/docker/build.sh +++ b/deployment/docker/build.sh @@ -6,6 +6,7 @@ VERSION=`get_version ../..` build_jellyfin_docker ../.. ../../Dockerfile jellyfin:amd64-${VERSION} -build_jellyfin_docker ../.. ../../Dockerfile.arm64v8 jellyfin:arm64v8-${VERSION} arm64v8 +build_jellyfin_docker ../.. ../../Dockerfile.arm jellyfin:arm-${VERSION} -build_jellyfin_docker ../.. ../../Dockerfile.arm32v7 jellyfin:arm32v7-${VERSION} arm32v7 +#build_jellyfin_docker ../.. ../../Dockerfile.arm64v8 jellyfin:arm64v8-${VERSION} +#build_jellyfin_docker ../.. ../../Dockerfile.arm32v7 jellyfin:arm32v7-${VERSION} diff --git a/deployment/docker/package.sh b/deployment/docker/package.sh index 402ac13552..d74426e2fe 100755 --- a/deployment/docker/package.sh +++ b/deployment/docker/package.sh @@ -6,7 +6,7 @@ VERSION=`get_version ../..` docker manifest create jellyfin:${VERSION} jellyfin:amd64-${VERSION} jellyfin:arm32v7-${VERSION} jellyfin:arm64v8-${VERSION} docker manifest annotate jellyfin:amd64-${VERSION} --os linux --arch amd64 -docker manifest annotate jellyfin:arm32v7-${VERSION} --os linux --arch arm --variant armv7 -docker manifest annotate jellyfin:arm64v8-${VERSION} --os linux --arch arm64 --variant armv8 +#docker manifest annotate jellyfin:arm32v7-${VERSION} --os linux --arch arm --variant armv7 +#docker manifest annotate jellyfin:arm64v8-${VERSION} --os linux --arch arm64 --variant armv8 -#TODO publish.sh - docker manifest push jellyfin:${VERSION}
\ No newline at end of file +#TODO publish.sh - docker manifest push jellyfin:${VERSION} |