Merged the two ARM platforms. To be split apart when a binary ffmpeg is required.

This commit is contained in:
Erwin de Haan
2019-01-13 23:43:12 +01:00
parent ca320ba7ac
commit 9b224d7080
4 changed files with 7 additions and 24 deletions

View File

@@ -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}

View File

@@ -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}
#TODO publish.sh - docker manifest push jellyfin:${VERSION}