nickslowinski/vaultwarden-test
1
0
Fork 0
geforkt von mirrored/vaultwarden
Code Pull-Requests Aktivität

Updated web vault to version 2.2

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Daniel García 2018-08-28 03:21:22 +02:00
Ursprung 781056152a
Commit 6660b0aef3
2 geänderte Dateien mit 10 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Diff-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

6
Dockerfile
Datei anzeigen

@ -4,7 +4,7 @@
####################### VAULT BUILD IMAGE ####################### ####################### VAULT BUILD IMAGE #######################
FROM node:8-alpine as vault 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" ENV URL "https://github.com/bitwarden/web.git"
@ -47,7 +47,7 @@ COPY ./rust-toolchain ./rust-toolchain
# Builds your dependencies and removes the # Builds your dependencies and removes the
# dummy project, except the target folder # dummy project, except the target folder
# This folder contains the compiled dependencies # This folder contains the compiled dependencies
RUN cargo build --release RUN cargo build --release --features vendored_openssl
RUN find . -not -path "./target*" -delete RUN find . -not -path "./target*" -delete
# Copies the complete project # Copies the complete project
@ -56,7 +56,7 @@ COPY . .
# Builds again, this time it'll just be # Builds again, this time it'll just be
# your actual source files being built # your actual source files being built
RUN cargo build --release RUN cargo build --release --features vendored_openssl
######################## RUNTIME IMAGE ######################## ######################## RUNTIME IMAGE ########################
# Create a new stage with a minimal image # Create a new stage with a minimal image

9
docker/set-vault-baseurl.patch
Datei anzeigen

@ -1,7 +1,7 @@
--- a/src/app/services/services.module.ts --- a/src/app/services/services.module.ts
+++ b/src/app/services/services.module.ts +++ b/src/app/services/services.module.ts
@@ -116,17 +116,15 @@ const exportService = new ExportService(folderService, cipherService, apiService @@ -120,20 +120,17 @@ const notificationsService = new NotificationsService(userService, syncService,
const importService = new ImportService(cipherService, folderService, apiService, i18nService, collectionService); const environmentService = new EnvironmentService(apiService, storageService, notificationsService);
const auditService = new AuditService(cryptoFunctionService, apiService); const auditService = new AuditService(cryptoFunctionService, apiService);
-const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost(), -const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost(),
@ -15,9 +15,14 @@
- const isDev = platformUtilsService.isDev(); - const isDev = platformUtilsService.isDev();
- if (!isDev && platformUtilsService.isSelfHost()) { - if (!isDev && platformUtilsService.isSelfHost()) {
- environmentService.baseUrl = window.location.origin; - environmentService.baseUrl = window.location.origin;
- } else {
- environmentService.notificationsUrl = isDev ? 'http://localhost:61840' :
- 'https://notifications.bitwarden.com'; // window.location.origin + '/notifications';
- } - }
+ const isDev = false; + const isDev = false;
+ environmentService.baseUrl = window.location.origin; + environmentService.baseUrl = window.location.origin;
+ environmentService.notificationsUrl = window.location.origin + '/notifications';
+
await apiService.setUrls({ await apiService.setUrls({
base: isDev ? null : window.location.origin, base: isDev ? null : window.location.origin,
api: isDev ? 'http://localhost:4000' : null, api: isDev ? 'http://localhost:4000' : null,