diff options
| author |  Jarred Sumner <jarred@jarredsumner.com>
| 2021-12-27 20:27:34 -0800 |
|---|---|---|
| committer | Jarred Sumner <jarred@jarredsumner.com>
| 2021-12-27 20:27:34 -0800 |
| commit | 1fd2d26185d63d7abe9e5bce15cb4320c99d7da7 (patch) | |
| tree | 9d111e7c766a0bc8125a7cef6f4c8551dbdafcf1 | |
| parent | cac19d9e8b9cb9f4225da9a7ba3ab7015a6d7d80 (diff) | |
| download | bun-1fd2d26185d63d7abe9e5bce15cb4320c99d7da7.tar.gz bun-1fd2d26185d63d7abe9e5bce15cb4320c99d7da7.tar.zst bun-1fd2d26185d63d7abe9e5bce15cb4320c99d7da7.zip | |
use buildx
| -rw-r--r-- | .docker/build-base.sh | 13 | ||||
| -rw-r--r-- | .docker/pull.sh | 11 | ||||
| -rw-r--r-- | Makefile | 2 |
3 files changed, 20 insertions, 6 deletions
diff --git a/.docker/build-base.sh b/.docker/build-base.sh new file mode 100644 index 000000000..21341a399 --- /dev/null +++ b/.docker/build-base.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +set -euxo pipefail + +export DOCKER_BUILDKIT=1 + +docker buildx build -t bunbunbunbun/bun-test-base:latest -f Dockerfile.base --target bun-test-base . --platform=linux/amd64 --build-arg BUILDARCH=amd64 +docker buildx build -t bunbunbunbun/bun-base:latest --platform=linux/amd64 --build-arg BUILDARCH=amd64 . +docker buildx build -t bunbunbunbun/bun-base-with-zig-and-webkit:latest --platform=linux/amd64 --build-arg BUILDARCH=amd64 . + +docker push bunbunbunbun/bun-test-base:latest +docker push bunbunbunbun/bun-base:latest +docker push bunbunbunbun/bun-base-with-zig-and-webkit:latest diff --git a/.docker/pull.sh b/.docker/pull.sh index 3a5e0b25c..55f320767 100644 --- a/.docker/pull.sh +++ b/.docker/pull.sh @@ -2,9 +2,10 @@ set -euxo pipefail -docker pull bunbunbunbun/bun-test-base:latest --platform=linux/amd64 -docker pull bunbunbunbun/bun-base:latest --platform=linux/amd64 -docker pull bunbunbunbun/bun-base-with-zig-and-webkit:latest --platform=linux/amd64 +docker pull bunbunbunbun/bun-test-base:amd64 --platform=linux/amd64 +docker pull bunbunbunbun/bun-base:amd64 --platform=linux/amd64 +docker pull bunbunbunbun/bun-base-with-zig-and-webkit:amd64 --platform=linux/amd64 -docker tag bun-base:latest bunbunbunbun/bun-base -docker tag bun-base-with-zig-and-webkit:latest bunbunbunbun/bun-base-with-zig-and-webkit:latest +docker tag bun-base:latest bunbunbunbun/bun-base:amd64 +docker tag bun-base-with-zig-and-webkit:latest bunbunbunbun/bun-base-with-zig-and-webkit:amd64 +docker tag bun-test-base:latest bunbunbunbun/bun-test-base:amd64 @@ -654,7 +654,7 @@ jsc-bindings-mac: $(OBJ_FILES) # mimalloc is built as object files so that it can overload the system malloc mimalloc: - cd $(BUN_DEPS_DIR)/mimalloc; cmake $(CMAKE_FLAGS) -DMI_BUILD_SHARED=OFF -DMI_BUILD_STATIC=ON -DMI_BUILD_TESTS=OFF -DMI_BUILD_OBJECT=OFF ${MIMALLOC_OVERRIDE_FLAG} -DMI_USE_CXX=ON .; make; + cd $(BUN_DEPS_DIR)/mimalloc; cmake $(CMAKE_FLAGS) -DMI_BUILD_SHARED=OFF -DMI_BUILD_STATIC=ON -DMI_BUILD_TESTS=OFF -DMI_BUILD_OBJECT=ON ${MIMALLOC_OVERRIDE_FLAG} -DMI_USE_CXX=ON .; make; cp $(BUN_DEPS_DIR)/mimalloc/$(MIMALLOC_INPUT_PATH) $(BUN_DEPS_OUT_DIR)/$(MIMALLOC_FILE) bun-link-lld-debug: |