Update webapp (#304)

* Make webapp install argument formatting neater * Update webapp version * Limit maximum upload size
ascoderu · Jan 30, 2020 · 301c10d · 301c10d
1 parent cd1b808
commit 301c10d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.env b/.env
@@ -11,7 +11,7 @@ LOKOLE_EMAIL_SERVER_QUEUES_SAS_KEY=
 LOKOLE_EMAIL_SERVER_QUEUES_NAMESPACE=
 LOKOLE_SENDGRID_KEY=
 REGISTRATION_CREDENTIALS=admin:password
-WEBAPP_VERSION=0.5.9
+WEBAPP_VERSION=0.5.10
 
 CLOUDBROWSER_PORT=10001
 AZURITE_PORT=10000

diff --git a/docker/client/Dockerfile b/docker/client/Dockerfile
@@ -9,8 +9,16 @@ WORKDIR /app
 ARG LOKOLE_PORT
 ARG LOKOLE_CLIENT_VERSION
 ARG INSTALLER_VERSION=${LOKOLE_CLIENT_VERSION}
+ARG MAX_UPLOAD_SIZE_MB=1
 RUN wget -q "https://raw.githubusercontent.com/ascoderu/opwen-webapp/${INSTALLER_VERSION}/install.py" \
- && USER=root python3 install.py web LocalOnly --system_setup=no --reboot=no --wifi=no --admin=no --log_directory=- --app_root=/web \
+ && USER=root python3 install.py web LocalOnly \
+       --system_setup=no \
+       --reboot=no \
+       --wifi=no \
+       --admin=no \
+       --log_directory=- \
+       --app_root=/web \
+       --max_upload_size="${MAX_UPLOAD_SIZE_MB}" \
  && rm -rf /tmp/install.py install.py
 
 WORKDIR /lib