Compare commits

..

4 Commits

Author SHA1 Message Date
J. Ryan Stinnett 7e3527ff9c
Merge pull request from mattcen/fix-arm-docker-build
Fix arm docker build
2020-07-31 13:29:11 +01:00
Matt Cengia 86185e8186 Document packages for installing Canvas via Docker
Signed-off-by: Matt Cengia <mattcen@mattcen.com>
2020-07-31 22:27:16 +10:00
Matt Cengia fb79373a6d Bump node build version
When trying to build the Docker image, I kept receiving an out-of-memory
error from Webpack. This issue is apparently explained at
https://github.com/webpack/webpack/issues/1914.
Several comments in the issue suggested using Node 12 or above. Doing so
resolved this issue for me.

Signed-off-by: Matt Cengia <mattcen@mattcen.com>
2020-07-16 16:21:00 +10:00
Matt Cengia 846cebe9ff Add build dependencies for 'canvas' to Dockerfile
When building the Docker image on amd64, canvas can be installed
from a pre-built binary. When building on an another architecture,
however, such as arm (e.g. on a Raspberry Pi), these binaries need to be
built locally, as per https://www.npmjs.com/package/canvas#compiling.
These added dependencies facilitate this. See also, issue .

Signed-off-by: Matt Cengia <mattcen@mattcen.com>
2020-07-16 16:21:00 +10:00
4 changed files with 15 additions and 32 deletions

View File

@ -1,21 +1,3 @@
Changes in [1.7.3-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.7.3-rc.1) (2020-07-31)
====================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.7.2...v1.7.3-rc.1)
* Upgrade to React SDK 3.1.0-rc.1 and JS SDK 8.0.1-rc.1
* Make Lojban translation available
[\#14703](https://github.com/vector-im/riot-web/pull/14703)
* Update from Weblate
[\#14841](https://github.com/vector-im/riot-web/pull/14841)
* Remove redundant lint dependencies
[\#14810](https://github.com/vector-im/riot-web/pull/14810)
* Bump elliptic from 6.5.2 to 6.5.3
[\#14826](https://github.com/vector-im/riot-web/pull/14826)
* Update mobile config intercept URL
[\#14796](https://github.com/vector-im/riot-web/pull/14796)
* Fix typo in https://
[\#14791](https://github.com/vector-im/riot-web/pull/14791)
Changes in [1.7.2](https://github.com/vector-im/riot-web/releases/tag/v1.7.2) (2020-07-27)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.7.1...v1.7.2)

View File

@ -1,5 +1,5 @@
# Builder
FROM node:10 as builder
FROM node:12 as builder
# Support custom branches of the react-sdk and js-sdk. This also helps us build
# images of riot-web develop.
@ -9,7 +9,10 @@ ARG REACT_SDK_BRANCH="master"
ARG JS_SDK_REPO="https://github.com/matrix-org/matrix-js-sdk.git"
ARG JS_SDK_BRANCH="master"
RUN apt-get update && apt-get install -y git dos2unix
RUN apt-get update && apt-get install -y git dos2unix \
# These packages are required for building Canvas on architectures like Arm
# See https://www.npmjs.com/package/canvas#compiling
build-essential libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev
WORKDIR /src

View File

@ -1,7 +1,7 @@
{
"name": "riot-web",
"productName": "Riot",
"version": "1.7.3-rc.1",
"version": "1.7.2",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -59,8 +59,8 @@
"browser-request": "^0.3.3",
"gfm.css": "^1.1.2",
"highlight.js": "^9.13.1",
"matrix-js-sdk": "8.0.1-rc.1",
"matrix-react-sdk": "3.1.0-rc.1",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
"prop-types": "^15.7.2",
"react": "^16.9.0",

View File

@ -7312,10 +7312,9 @@ mathml-tag-names@^2.1.1:
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
matrix-js-sdk@8.0.1-rc.1:
version "8.0.1-rc.1"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.1-rc.1.tgz#dbc2544f0058e2530e84a5d3b3e1abe06e395597"
integrity sha512-K3wOAf8lVLBx3Xhgb57JoVtFRVf52PHDnsnj00ST4kCAbnlJ3iuJ8OuOX16Bbk0fvV7RLJi/At4bm1Ld6PsIkQ==
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "8.0.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c669382e12c8cd1d7d538421dfad4f50812af44d"
dependencies:
"@babel/runtime" "^7.8.3"
another-json "^0.2.0"
@ -7335,10 +7334,9 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0"
expect "^1.20.2"
matrix-react-sdk@3.1.0-rc.1:
version "3.1.0-rc.1"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.1.0-rc.1.tgz#dbf6a9b9ad5542075d8a894d4009d04bba149566"
integrity sha512-CJVlYARIYBKVBtoyDVPeBGH/rbqTgerWiYovqVq3+TG+DUDFZYSRXLRymxVwTSB23PKP1PJ8+MEOA0Yx2r2gmg==
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "3.0.0"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/f9540dd7cd67666ad58beac9b11c7bc4a5872673"
dependencies:
"@babel/runtime" "^7.10.5"
await-lock "^2.0.1"
@ -7366,7 +7364,7 @@ matrix-react-sdk@3.1.0-rc.1:
is-ip "^2.0.0"
linkifyjs "^2.1.9"
lodash "^4.17.19"
matrix-js-sdk "8.0.1-rc.1"
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
minimist "^1.2.5"
pako "^1.0.11"
parse5 "^5.1.1"