v1.1.1

Add Dockerfile

.dockerignore

@@ -0,0 +1,11 @@
+# Exclude a bunch of stuff which can make the build context a larger than it needs to be
+.git/
+test/
+webapp/
+lib/
+node_modules/
+electron_app/
+karma-reports/
+.idea/
+.tmp/
+config.json*

CHANGELOG.md

@@ -1,3 +1,20 @@
+Changes in [1.1.1](https://github.com/vector-im/riot-web/releases/tag/v1.1.1) (2019-05-14)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.0...v1.1.1)
+
+ * react-sdk v1.1.1 to fix regressions with registration
+
+Changes in [1.1.0](https://github.com/vector-im/riot-web/releases/tag/v1.1.0) (2019-05-07)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.0-rc.1...v1.1.0)
+
+ * Add Dockerfile
+   [\#9632](https://github.com/vector-im/riot-web/pull/9632)
+ * Add Dockerfile (part 2)
+   [\#9426](https://github.com/vector-im/riot-web/pull/9426)
+ * Add new scalar staging url
+   [\#9601](https://github.com/vector-im/riot-web/pull/9601)
+
 Changes in [1.1.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.1.0-rc.1) (2019-04-30)
 ====================================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.8...v1.1.0-rc.1)

Dockerfile

@@ -0,0 +1,31 @@
+# Builder
+FROM node:10-alpine as builder
+
+# Support custom branches of the react-sdk and js-sdk. This also helps us build
+# images of riot-web develop.
+ARG USE_CUSTOM_SDKS=false
+ARG REACT_SDK_REPO="https://github.com/matrix-org/matrix-react-sdk.git"
+ARG REACT_SDK_BRANCH="master"
+ARG JS_SDK_REPO="https://github.com/matrix-org/matrix-js-sdk.git"
+ARG JS_SDK_BRANCH="master"
+
+RUN apk add --no-cache git dos2unix
+
+WORKDIR /src
+
+COPY . /src
+RUN dos2unix /src/scripts/docker-link-repos.sh && sh /src/scripts/docker-link-repos.sh
+RUN yarn install
+RUN yarn build
+
+# Copy the config now so that we don't create another layer in the app image
+RUN cp /src/config.sample.json /src/webapp/config.json
+
+
+# App
+FROM nginx:latest
+
+COPY --from=builder /src/webapp /app
+
+RUN rm -rf /usr/share/nginx/html \
+ && ln -s /app /usr/share/nginx/html

README.md

@@ -253,6 +253,42 @@ To change the config.json for the desktop app, create a config file which will b
 
 In the paths above, `$NAME` is typically `Riot`, unless you use `--profile $PROFILE` in which case it becomes `Riot-$PROFILE`.
 
+Running from Docker
+===================
+
+The Docker image can be used to serve riot-web as a web server. The easiest way to use 
+it is to use the prebuilt image:
+```bash
+docker run -p 80:80 vectorim/riot-web
+``` 
+
+To supply your own custom `config.json`, map a volume to `/app/config.json`. For example, 
+if your custom config was located at `/etc/riot-web/config.json` then your Docker command
+would be:
+```bash
+docker run -p 80:80 -v /etc/riot-web/config.json:/app/config.json vectorim/riot-web
+```
+
+To build the image yourself:
+```bash
+git clone https://github.com/vector-im/riot-web.git riot-web
+cd riot-web
+git checkout master
+docker build -t vectorim/riot-web .
+```
+
+If you're building a custom branch, or want to use the develop branch, check out the appropriate
+riot-web branch and then run:
+```bash
+docker build -t vectorim/riot-web:develop \
+    --build-arg USE_CUSTOM_SDKS=true \
+    --build-arg REACT_SDK_REPO="https://github.com/matrix-org/matrix-react-sdk.git" \
+    --build-arg REACT_SDK_BRANCH="develop" \
+    --build-arg JS_SDK_REPO="https://github.com/matrix-org/matrix-js-sdk.git" \
+    --build-arg JS_SDK_BRANCH="develop" \
+    .
+```
+
 Labs Features
 =============
 

electron_app/package.json

@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "1.1.0-rc.1",
+  "version": "1.1.1",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "dependencies": {

electron_app/riot.im/config.json

@@ -6,6 +6,7 @@
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
     "integrations_widgets_urls": [
+        "https://scalar-staging.vector.im/api",
         "https://scalar-staging.riot.im/scalar/api",
         "https://scalar.vector.im/api"
     ],

package.json

@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "1.1.0-rc.1",
+  "version": "1.1.1",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {
@@ -73,8 +73,8 @@
     "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
     "gfm.css": "^1.1.2",
     "highlight.js": "^9.13.1",
-    "matrix-js-sdk": "^1.1.0-rc.1",
-    "matrix-react-sdk": "^1.1.0-rc.1",
+    "matrix-js-sdk": "1.1.0",
+    "matrix-react-sdk": "1.1.1",
     "modernizr": "^3.6.0",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz",
     "prop-types": "^15.6.2",

scripts/docker-link-repos.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+set -ex
+
+if [ $USE_CUSTOM_SDKS == false ]
+then
+    echo "skipping react-sdk and js-sdk installs: USE_CUSTOM_SDKS is false"
+    exit 0
+fi
+
+echo "Linking js-sdk"
+git clone $JS_SDK_REPO js-sdk
+cd js-sdk
+git checkout $JS_SDK_BRANCH
+yarn link
+yarn install
+cd ../
+
+echo "Linking react-sdk"
+git clone $REACT_SDK_REPO react-sdk
+cd react-sdk
+git checkout $REACT_SDK_BRANCH
+yarn link
+yarn link matrix-js-sdk
+yarn install
+cd ../
+
+echo "Setting up riot-web with react-sdk and js-sdk packages"
+yarn link matrix-js-sdk
+yarn link matrix-react-sdk

src/vector/mobile_guide/index.html

@@ -235,7 +235,7 @@ body {
               </a>
               <h3 class="mx_Spacer">Android</h3>
               <p>If you have an Android device, install the Android Riot app from Google Play or F-droid.</p>
-              <a href="https://play.google.com/store/apps/details?id=im.vector.alpha" target="_blank" class="mx_ClearDecoration">
+              <a href="https://play.google.com/store/apps/details?id=im.vector.app" target="_blank" class="mx_ClearDecoration">
                 <svg width="162px" height="48px" viewBox="0 0 162 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
                     <!-- Generator: Sketch 51.2 (57519) - http://www.bohemiancoding.com/sketch -->
                     <desc>Created with Sketch.</desc>

yarn.lock

@@ -5745,10 +5745,10 @@ math-random@^1.0.1:
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
   integrity sha1-izqsWIuKZuSXXjzepn97sylgH6w=
 
-matrix-js-sdk@^1.1.0-rc.1:
-  version "1.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-1.1.0-rc.1.tgz#11a9e9215e766274d99f44eff0a8c4d33d34f870"
-  integrity sha512-I87gvaMKKmFGDU8q4YUiEP0RVr0ni+v64TYaqllKV2zMGgl2serz+O9pvgfyGgzwFUQ77nPG7NGH4ku+S5I2LA==
+matrix-js-sdk@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-1.1.0.tgz#f0db49de2aa0b0d50c1fe49da538beb4926ce59c"
+  integrity sha512-ECoMN6DkwPdKiMa/jSoMkSDngFCo6x7oH84rLd1NtD7lBPl3Ejj6ARa0iIELE7u0OUO6J0FzdWh7Hd0ZnVTmww==
   dependencies:
     another-json "^0.2.0"
     babel-runtime "^6.26.0"
@@ -5770,10 +5770,10 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-matrix-react-sdk@^1.1.0-rc.1:
-  version "1.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.1.0-rc.1.tgz#40a41c230001a29e1ae81618225b1607752ac529"
-  integrity sha512-0Mw0qYckD1Ft4HLkH5/PU4+rHbaYKvQDub+39prRh6uX7iM7Y91NObrzdAKnjMR59+aZKbUWvt8Tev7E3lDm5g==
+matrix-react-sdk@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.1.1.tgz#7a6d22cb0fb5265de0ffef51f1c0a0c1427db67b"
+  integrity sha512-vVPy9ChMLlfdGRGmAgtwLtyfw/Gt/03E/1X9Y5jnHZ+inMZgJgY5RZkCzUdC3afQYtd3dimzqoaYLSa+HQ1RWw==
   dependencies:
     babel-plugin-syntax-dynamic-import "^6.18.0"
     babel-runtime "^6.26.0"
@@ -5799,7 +5799,7 @@ matrix-react-sdk@^1.1.0-rc.1:
     linkifyjs "^2.1.6"
     lodash "^4.13.1"
     lolex "2.3.2"
-    matrix-js-sdk "^1.1.0-rc.1"
+    matrix-js-sdk "1.1.0"
     optimist "^0.6.1"
     pako "^1.0.5"
     png-chunks-extract "^1.0.0"