Skip to content

Commit

Permalink
Try this
Browse files Browse the repository at this point in the history
  • Loading branch information
NorthernMan54 committed Nov 27, 2024
1 parent 370abf4 commit 7cf2972
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
9 changes: 5 additions & 4 deletions .prebuild/Dockerfile.debian
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ ENV QEMU_ARCH=${QEMU_ARCH:-x86_64}

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

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

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

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

RUN npm set prefix /usr/local

RUN mkdir /node-pty
WORKDIR /node-pty
Expand Down
16 changes: 8 additions & 8 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,18 @@ echo
#docker run -v $(pwd):/node-pty multiarch-build ./.prebuild/build.sh .prebuild/prebuild.js ${nodeBuildTargets}
#docker run --rm -v $(pwd):/node-pty multiarch-build ./.prebuild/build.sh .prebuild/prebuildify.js ${nodeBuildTargets}
# Older

export BASE_IMAGE=balenalib/raspberrypi3-debian:bookworm
# buster -> bullseye -> bookworm
export BASE_IMAGE=balenalib/raspberrypi3-debian:bullseye
export QEMU_ARCH=arm
export DOCKERFILE="Dockerfile.debian"
export CMD=$BuildAllCMD
echo
echo "--------------------------- $QEMU_ARCH - $DOCKERFILE -------------------------------"
echo
#docker build -f .prebuild/$DOCKERFILE --build-arg BASE_IMAGE=${BASE_IMAGE} --build-arg QEMU_ARCH=${QEMU_ARCH} -t multiarch-build .
#docker run --rm -v $(pwd):/node-pty multiarch-build bash -c "$CMD"

# Newer
docker build -f .prebuild/$DOCKERFILE --build-arg BASE_IMAGE=${BASE_IMAGE} --build-arg QEMU_ARCH=${QEMU_ARCH} -t multiarch-build .
# docker run --rm -v $(pwd):/node-pty multiarch-build bash -c "$CMD"
docker run -v $(pwd):/node-pty multiarch-build bash -c bash
# docker run --rm -it --entrypoint /bin/bash 82cef23ea419

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

# Not Impacted

Expand Down

0 comments on commit 7cf2972

Please sign in to comment.