瀏覽代碼

add cross-platform docker build support

Nick Sweeting 2 年之前
父節點
當前提交
e5eee4e0b6
共有 1 個文件被更改,包括 19 次插入5 次删除
  1. 19 5
      bin/build_docker.sh

+ 19 - 5
bin/build_docker.sh

@@ -13,21 +13,35 @@ IFS=$'\n'
 REPO_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && cd .. && pwd )"
 REPO_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && cd .. && pwd )"
 VERSION="$(jq -r '.version' < "$REPO_DIR/package.json")"
 VERSION="$(jq -r '.version' < "$REPO_DIR/package.json")"
 SHORT_VERSION="$(echo "$VERSION" | perl -pe 's/(\d+)\.(\d+)\.(\d+)/$1.$2/g')"
 SHORT_VERSION="$(echo "$VERSION" | perl -pe 's/(\d+)\.(\d+)\.(\d+)/$1.$2/g')"
+TAG_NAME="dev"
 cd "$REPO_DIR"
 cd "$REPO_DIR"
 
 
 which docker > /dev/null
 which docker > /dev/null
 
 
+
+# Install QEMU binaries for cross-platform building
+docker run --privileged --rm tonistiigi/binfmt --install all || true
+
+# Create Docker builder for cross-platform building
+docker buildx use xbuilder || docker buildx create --name xbuilder --driver docker-container --bootstrap --use
+
+# Verify that amd64 and arm64 support are all present
+docker buildx inspect | grep 'amd64.*arm64' || exit 1
+
+
 echo "[+] Building archivebox:$VERSION docker image..."
 echo "[+] Building archivebox:$VERSION docker image..."
-docker build . -t archivebox \
-               -t archivebox:latest \
+#docker build . \
+docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --push . \
+               -t archivebox \
+               -t archivebox:$TAG_NAME \
                -t archivebox:$VERSION \
                -t archivebox:$VERSION \
                -t archivebox:$SHORT_VERSION \
                -t archivebox:$SHORT_VERSION \
-               -t docker.io/nikisweeting/archivebox:latest \
+               -t docker.io/nikisweeting/archivebox:$TAG_NAME \
                -t docker.io/nikisweeting/archivebox:$VERSION \
                -t docker.io/nikisweeting/archivebox:$VERSION \
                -t docker.io/nikisweeting/archivebox:$SHORT_VERSION \
                -t docker.io/nikisweeting/archivebox:$SHORT_VERSION \
-               -t docker.io/archivebox/archivebox:latest \
+               -t docker.io/archivebox/archivebox:$TAG_NAME \
                -t docker.io/archivebox/archivebox:$VERSION \
                -t docker.io/archivebox/archivebox:$VERSION \
                -t docker.io/archivebox/archivebox:$SHORT_VERSION \
                -t docker.io/archivebox/archivebox:$SHORT_VERSION \
-               -t docker.pkg.github.com/archivebox/archivebox/archivebox:latest \
+               -t docker.pkg.github.com/archivebox/archivebox/archivebox:$TAG_NAME \
                -t docker.pkg.github.com/archivebox/archivebox/archivebox:$VERSION \
                -t docker.pkg.github.com/archivebox/archivebox/archivebox:$VERSION \
                -t docker.pkg.github.com/archivebox/archivebox/archivebox:$SHORT_VERSION
                -t docker.pkg.github.com/archivebox/archivebox/archivebox:$SHORT_VERSION