Skip to content

Commit 7cf2972

Browse files
committed
Try this
1 parent 370abf4 commit 7cf2972

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

.prebuild/Dockerfile.debian

+5-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ ENV QEMU_ARCH=${QEMU_ARCH:-x86_64}
66

77
COPY .prebuild/qemu/qemu-${QEMU_ARCH}-static /usr/bin/
88

9-
RUN apt-get update \
10-
&& apt-get install -y gcc g++ make python3 curl
9+
RUN apt-get update --allow-insecure-repositories
10+
RUN apt-get install -y gcc g++ make python3 curl
1111

1212
RUN [ "$(uname -m)" = "x86_64" ] && apt-get install -y g++-multilib gcc-multilib || echo "ok"
1313

@@ -27,8 +27,9 @@ RUN case "${QEMU_ARCH}" in \
2727
&& echo "Installing NodeJS node-v$NODE_VERSION-linux-$NODE_ARCH.tar.gz" \
2828
&& tar -xzf "node-v$NODE_VERSION-linux-$NODE_ARCH.tar.gz" -C /usr/local --strip-components=1 --no-same-owner \
2929
&& rm "node-v$NODE_VERSION-linux-$NODE_ARCH.tar.gz" \
30-
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs \
31-
&& npm set prefix /usr/local
30+
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs
31+
32+
RUN npm set prefix /usr/local
3233

3334
RUN mkdir /node-pty
3435
WORKDIR /node-pty

build.sh

+8-8
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,18 @@ echo
5151
#docker run -v $(pwd):/node-pty multiarch-build ./.prebuild/build.sh .prebuild/prebuild.js ${nodeBuildTargets}
5252
#docker run --rm -v $(pwd):/node-pty multiarch-build ./.prebuild/build.sh .prebuild/prebuildify.js ${nodeBuildTargets}
5353
# Older
54-
55-
export BASE_IMAGE=balenalib/raspberrypi3-debian:bookworm
54+
# buster -> bullseye -> bookworm
55+
export BASE_IMAGE=balenalib/raspberrypi3-debian:bullseye
5656
export QEMU_ARCH=arm
5757
export DOCKERFILE="Dockerfile.debian"
5858
export CMD=$BuildAllCMD
5959
echo
6060
echo "--------------------------- $QEMU_ARCH - $DOCKERFILE -------------------------------"
6161
echo
62-
#docker build -f .prebuild/$DOCKERFILE --build-arg BASE_IMAGE=${BASE_IMAGE} --build-arg QEMU_ARCH=${QEMU_ARCH} -t multiarch-build .
63-
#docker run --rm -v $(pwd):/node-pty multiarch-build bash -c "$CMD"
64-
65-
# Newer
62+
docker build -f .prebuild/$DOCKERFILE --build-arg BASE_IMAGE=${BASE_IMAGE} --build-arg QEMU_ARCH=${QEMU_ARCH} -t multiarch-build .
63+
# docker run --rm -v $(pwd):/node-pty multiarch-build bash -c "$CMD"
64+
docker run -v $(pwd):/node-pty multiarch-build bash -c bash
65+
# docker run --rm -it --entrypoint /bin/bash 82cef23ea419
6666

6767
# export BASE_IMAGE=balenalib/raspberrypi3-debian:bookworm
6868
# export QEMU_ARCH=arm
@@ -121,8 +121,8 @@ export CMD=$RunCMD
121121
echo
122122
echo "--------------------------- $QEMU_ARCH - $DOCKERFILE -------------------------------"
123123
echo
124-
docker build -f .prebuild/$DOCKERFILE --build-arg BASE_IMAGE=${BASE_IMAGE} --build-arg QEMU_ARCH=${QEMU_ARCH} -t multiarch-build .
125-
docker run --rm -v $(pwd):/node-pty multiarch-build bash -c "$CMD"
124+
# docker build -f .prebuild/$DOCKERFILE --build-arg BASE_IMAGE=${BASE_IMAGE} --build-arg QEMU_ARCH=${QEMU_ARCH} -t multiarch-build .
125+
# docker run --rm -v $(pwd):/node-pty multiarch-build bash -c "$CMD"
126126

127127
# Not Impacted
128128

0 commit comments

Comments
 (0)