Merge branch 'bugfix/build_wasm-syntax+update-emscripten' into 'devel'

Bugfix/build wasm syntax+update emscripten See merge request sds-dev/sd-connect/swift-browser-ui!116
CSCfi · Jul 24, 2023 · b821577 · b821577
2 parents b01d987 + c73e43f
commit b821577
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - (GH #642) Add support for decrypting downloaded files
 - Automate building wasm with npm
+  - use `CSCfi/docker-emscripten-crypt4gh` image `1.2.0`
 - Show notification when changing permission in share modal
 - Use OIDC as the default Keystone login provider for SSO
 - (GH #864) Vault c4ghtransit integration - Uploads object headers to Vault in addition to Object Storage

diff --git a/dockerfiles/Dockerfile-build-crypt b/dockerfiles/Dockerfile-build-crypt
@@ -1,5 +1,5 @@
 # Build wasm encryption
-FROM ghcr.io/cscfi/docker-emscripten-crypt4gh:1.1.0 AS WASMCRYPT
+FROM ghcr.io/cscfi/docker-emscripten-crypt4gh:1.2.0 AS WASMCRYPT
 
 COPY swift_browser_ui_frontend/wasm/ /src/
 

diff --git a/dockerfiles/Dockerfile-build-crypt-devel b/dockerfiles/Dockerfile-build-crypt-devel
@@ -1,5 +1,5 @@
 # Build wasm encryption
-FROM ghcr.io/cscfi/docker-emscripten-crypt4gh:1.1.0 AS WASMCRYPT
+FROM ghcr.io/cscfi/docker-emscripten-crypt4gh:1.2.0 AS WASMCRYPT
 
 COPY swift_browser_ui_frontend/wasm/ /src/
 

diff --git a/swift_browser_ui_frontend/build_wasm.sh b/swift_browser_ui_frontend/build_wasm.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-[[ ! -x "$(command -v docker)" ]] && echo "Docker is used to build the javascript WebAssembly dependencies, but it's not installed." && exit;
+[ ! -x "$(command -v docker)" ] && echo "Docker is used to build the javascript WebAssembly dependencies, but it's not installed." && exit;
 if ! docker version > /dev/null 2>&1; then echo "Docker is installed, but it seems like there's an error."; exit 1; fi
 
 SCRIPT="$(realpath $0)"