nodejs/hookshot
nodejs/hookshot
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-hookshot.git synced 2025-03-10 21:19:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get ARM64 builds working (#339)

Browse Source 
* Use node:16-slim for final image build

* changelog

* Add ignore scripts to final install step

* Copy matrix-sdk-crypto-nodejs built files

* Add workaround to build images foo crypto-nodejs

* chmod +x

* require bash for builds

* Add apt install to hopefully make the rust bits build for arm

* Fix missing multilib (#349)

* Update and rename 336.misc to 339.bugfix

Co-authored-by: Paul Tötterman <ptman@users.noreply.github.com>
This commit is contained in:
Will Hunt 2022-05-10 15:55:30 +01:00 committed by GitHub
parent e9c6afdc44
commit c02d4349a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Dockerfile
View File

@ -10,11 +10,16 @@ WORKDIR /src
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal
ENV PATH="/root/.cargo/bin:${PATH}" ENV PATH="/root/.cargo/bin:${PATH}"
# Needed to build rust things for matrix-sdk-crypto-nodejs
# See https://github.com/matrix-org/matrix-rust-sdk-bindings/blob/main/crates/matrix-sdk-crypto-nodejs/release/Dockerfile.linux#L5-L6
RUN apt-get update && apt-get install -y build-essential cmake
# Workaround: Need to install esbuild manually https://github.com/evanw/esbuild/issues/462#issuecomment-771328459 # Workaround: Need to install esbuild manually https://github.com/evanw/esbuild/issues/462#issuecomment-771328459
RUN yarn --ignore-scripts RUN yarn --ignore-scripts
RUN node node_modules/esbuild/install.js RUN node node_modules/esbuild/install.js
RUN yarn build --pure-lockfile RUN yarn build --pure-lockfile
# Stage 1: The actual container # Stage 1: The actual container
FROM node:16-slim FROM node:16-slim
@ -23,9 +28,13 @@ COPY --from=builder /src/public/ /bin/matrix-hookshot/public/
COPY --from=builder /src/package.json /bin/matrix-hookshot/ COPY --from=builder /src/package.json /bin/matrix-hookshot/
COPY --from=builder /src/yarn.lock /bin/matrix-hookshot/ COPY --from=builder /src/yarn.lock /bin/matrix-hookshot/
WORKDIR /bin/matrix-hookshot WORKDIR /bin/matrix-hookshot
# --ignore-scripts so we don't try to build # --ignore-scripts so we don't try to build
RUN yarn --ignore-scripts --production --pure-lockfile && yarn cache clean RUN yarn --ignore-scripts --production --pure-lockfile && yarn cache clean
# Copy rust bindings for crypto, since we built them in the previous step.
COPY --from=builder /src/node_modules/@turt2live/matrix-sdk-crypto-nodejs /bin/matrix-hookshot/node_modules/@turt2live/matrix-sdk-crypto-nodejs
VOLUME /data VOLUME /data
EXPOSE 9993 EXPOSE 9993
EXPOSE 7775 EXPOSE 7775

1
changelog.d/339.bugfix Normal file
View File

@ -0,0 +1 @@
Docker images can now be built cross-platform. Thanks @ptman for getting arm64 builds going!

8
scripts/build-app.sh
View File

@ -1,8 +1,14 @@
#!/bin/sh #!/bin/bash
# exit when any command fails # exit when any command fails
set -e set -e
# Workaround for non-x64 / ia32 targets
pushd node_modules/@turt2live/matrix-sdk-crypto-nodejs
echo "Checking matrix-sdk-crypto-nodejs bindings (and building if required)"
node check-exists.js
popd
echo "Building Rust layer" echo "Building Rust layer"
yarn run build:app:rs yarn run build:app:rs
echo "Running rust-typescript definitions fix" echo "Running rust-typescript definitions fix"