From adf40291e886b46f6241de5eb464057eac610ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Tue, 16 Oct 2018 16:18:04 +0200 Subject: [PATCH] Update web vault to 2.4.0 --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.alpine | 2 +- Dockerfile.armv7 | 2 +- docker/set-vault-baseurl.patch | 5 ++--- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 03ad2311..2a70f17d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ####################### VAULT BUILD IMAGE ####################### FROM node:8-alpine as vault -ENV VAULT_VERSION "v2.3.0" +ENV VAULT_VERSION "v2.4.0" ENV URL "https://github.com/bitwarden/web.git" diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index e0cbca04..77bea2d3 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -4,7 +4,7 @@ ####################### VAULT BUILD IMAGE ####################### FROM node:8-alpine as vault -ENV VAULT_VERSION "v2.3.0" +ENV VAULT_VERSION "v2.4.0" ENV URL "https://github.com/bitwarden/web.git" diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 3d957f47..edcfd59a 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -4,7 +4,7 @@ ####################### VAULT BUILD IMAGE ####################### FROM node:8-alpine as vault -ENV VAULT_VERSION "v2.3.0" +ENV VAULT_VERSION "v2.4.0" ENV URL "https://github.com/bitwarden/web.git" diff --git a/Dockerfile.armv7 b/Dockerfile.armv7 index 0eb51c7f..2712ae65 100644 --- a/Dockerfile.armv7 +++ b/Dockerfile.armv7 @@ -4,7 +4,7 @@ ####################### VAULT BUILD IMAGE ####################### FROM node:8-alpine as vault -ENV VAULT_VERSION "v2.3.0" +ENV VAULT_VERSION "v2.4.0" ENV URL "https://github.com/bitwarden/web.git" diff --git a/docker/set-vault-baseurl.patch b/docker/set-vault-baseurl.patch index 5e872023..f05b7763 100644 --- a/docker/set-vault-baseurl.patch +++ b/docker/set-vault-baseurl.patch @@ -1,6 +1,6 @@ --- a/src/app/services/services.module.ts +++ b/src/app/services/services.module.ts -@@ -120,20 +120,17 @@ const notificationsService = new NotificationsService(userService, syncService, +@@ -120,20 +120,16 @@ const notificationsService = new NotificationsService(userService, syncService, const environmentService = new EnvironmentService(apiService, storageService, notificationsService); const auditService = new AuditService(cryptoFunctionService, apiService); @@ -22,7 +22,6 @@ + const isDev = false; + environmentService.baseUrl = window.location.origin; + environmentService.notificationsUrl = window.location.origin + '/notifications'; -+ - await apiService.setUrls({ + apiService.setUrls({ base: isDev ? null : window.location.origin, api: isDev ? 'http://localhost:4000' : null,