diff --git a/build-docker.sh b/build-docker.sh index 18444ebe73..4ba94e6b8f 100755 --- a/build-docker.sh +++ b/build-docker.sh @@ -83,7 +83,13 @@ echo echo ">>> DOCKER BUILD ALPINE_VERSION=$ALPINE_VERSION ALPINE_ARCH=$ALPINE_ARCH NIX_VERSION=$NIX_VERSION -t $CONTAINER_NAME" echo -docker build --build-arg ALPINE_VERSION="$ALPINE_VERSION" --build-arg ALPINE_ARCH="$ALPINE_ARCH" --build-arg NIX_VERSION="$NIX_VERSION" -t "$CONTAINER_NAME" ci/ +docker build \ + --network=host \ + --build-arg ALPINE_VERSION="$ALPINE_VERSION" \ + --build-arg ALPINE_ARCH="$ALPINE_ARCH" \ + --build-arg NIX_VERSION="$NIX_VERSION" \ + -t "$CONTAINER_NAME" \ + ci/ # stat under macOS has slightly different cli interface USER=$(stat -c "%u" . 2>/dev/null || stat -f "%u" .) @@ -125,7 +131,10 @@ EOF echo ">>> DOCKER RUN core BITCOIN_ONLY=$BITCOIN_ONLY PRODUCTION=$PRODUCTION" echo - docker run -it --rm \ + docker run \ + --network=host \ + -it \ + --rm \ -v "$DIR:/local" \ -v "$DIR/build/core$DIRSUFFIX":/build:z \ --env BITCOIN_ONLY="$BITCOIN_ONLY" \ @@ -171,7 +180,10 @@ EOF echo ">>> DOCKER RUN legacy BITCOIN_ONLY=$BITCOIN_ONLY PRODUCTION=$PRODUCTION" echo - docker run -it --rm \ + docker run \ + --network=host \ + -it \ + --rm \ -v "$DIR:/local" \ -v "$DIR/build/legacy$DIRSUFFIX":/build:z \ --env BITCOIN_ONLY="$BITCOIN_ONLY" \ @@ -179,7 +191,6 @@ EOF --init \ "$CONTAINER_NAME" \ /nix/var/nix/profiles/default/bin/nix-shell --run "bash /local/build/$SCRIPT_NAME" - done # all built, show fingerprints