vw_small

commit 6660b0aef391f6bc20ce1991ff843a85d63b3afe
parent 781056152a4b8e5b6bc70031aafd65bf9d59fd1c
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date:   Tue, 28 Aug 2018 03:21:22 +0200

Updated web vault to version 2.2

Diffstat:
M
Dockerfile
 | 
6
+++---
M
docker/set-vault-baseurl.patch
 | 
9
+++++++--

2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,7 @@
 ####################### VAULT BUILD IMAGE  #######################
 FROM node:8-alpine as vault
 
-ENV VAULT_VERSION "v2.1.1"
+ENV VAULT_VERSION "v2.2.0"
 
 ENV URL "https://github.com/bitwarden/web.git"
 
@@ -47,7 +47,7 @@ COPY ./rust-toolchain ./rust-toolchain
 # Builds your dependencies and removes the
 # dummy project, except the target folder
 # This folder contains the compiled dependencies
-RUN cargo build --release
+RUN cargo build --release --features vendored_openssl
 RUN find . -not -path "./target*" -delete
 
 # Copies the complete project
@@ -56,7 +56,7 @@ COPY . .
 
 # Builds again, this time it'll just be
 # your actual source files being built
-RUN cargo build --release
+RUN cargo build --release --features vendored_openssl
 
 ######################## RUNTIME IMAGE  ########################
 # Create a new stage with a minimal image
diff --git a/docker/set-vault-baseurl.patch b/docker/set-vault-baseurl.patch
@@ -1,7 +1,7 @@
 --- a/src/app/services/services.module.ts
 +++ b/src/app/services/services.module.ts
-@@ -116,17 +116,15 @@ const exportService = new ExportService(folderService, cipherService, apiService
- const importService = new ImportService(cipherService, folderService, apiService, i18nService, collectionService);
+@@ -120,20 +120,17 @@ const notificationsService = new NotificationsService(userService, syncService,
+ const environmentService = new EnvironmentService(apiService, storageService, notificationsService);
  const auditService = new AuditService(cryptoFunctionService, apiService);
  
 -const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost(),
@@ -15,9 +15,14 @@
 -        const isDev = platformUtilsService.isDev();
 -        if (!isDev && platformUtilsService.isSelfHost()) {
 -            environmentService.baseUrl = window.location.origin;
+-        } else {
+-            environmentService.notificationsUrl = isDev ? 'http://localhost:61840' :
+-                'https://notifications.bitwarden.com'; // window.location.origin + '/notifications';
 -        }
 +        const isDev = false;
 +        environmentService.baseUrl = window.location.origin;
++        environmentService.notificationsUrl = window.location.origin + '/notifications';
++
          await apiService.setUrls({
              base: isDev ? null : window.location.origin,
              api: isDev ? 'http://localhost:4000' : null,