From f6dc98a196c09db03ac7c3a4651c5cd9212693ca Mon Sep 17 00:00:00 2001 From: maany Date: Tue, 5 Mar 2024 13:09:36 +0100 Subject: [PATCH] webui: update README and add TMP_PATCH_DIR in entrypoint --- webui/README.md | 4 ++-- webui/docker-entrypoint.sh | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/webui/README.md b/webui/README.md index 16b2df0..339e053 100644 --- a/webui/README.md +++ b/webui/README.md @@ -20,7 +20,7 @@ This image provides the Rucio WebUI which works as a web frontend to the Rucio s docker build --rm --no-cache --platform=linux/amd64 --build-arg TAG=33.0.0 -t rucio-webui:33.0.0 . ``` -For M1 Macs, the `--platform` flag should be set to `linux/arm64` instead. +For ARM based platforms (For eg, Apple Silicone), the `--platform` flag should be set to `linux/arm64` instead. ```bash docker build --rm --no-cache --platform=linux/arm64 --build-arg TAG=33.0.0 -t rucio-webui:33.0.0 . @@ -70,7 +70,7 @@ The WebUI container can be configured using environment variables. There are two The following sections list the available configuration variables: ### NextJS Configuration -The following environment variables are used to configure the NextJS App. As a convention, the environment variables are prefixed with `RUCIO_WEBUI_` and are by the [env-generator](https://github.com/rucio/webui/tree/master/tools/env-generator) tool , which creates the environment file used by the NextJS application. When running the container, the `-e` flag must specify the `FULL_NAME` of the corresponding environment variable. +The following environment variables are used to configure the NextJS App. As a convention, the environment variables are prefixed with `RUCIO_WEBUI_` and are generated by the [env-generator](https://github.com/rucio/webui/tree/master/tools/env-generator) tool , which creates the environment file used by the NextJS application. When running the container, the `-e` flag must specify the `FULL_NAME` of the corresponding environment variable. | Variable Name | Full Name | Description | Example | Default | |-----------------|-----------------------------|--------------------------------------------------------------------------------------|--------------------------------|---------| diff --git a/webui/docker-entrypoint.sh b/webui/docker-entrypoint.sh index b390061..e6a835e 100755 --- a/webui/docker-entrypoint.sh +++ b/webui/docker-entrypoint.sh @@ -44,6 +44,10 @@ if [ -d "/patch" ] then echo "=================== Apply Patches ===================" log "Patches found. Trying to apply them" + + TMP_PATCH_DIR="$(mktemp -d)" + trap 'rm -rf -- "$TMP_PATCH_DIR"' EXIT # Deletes temp dir when script exits + for patchfile in /patch/* do echo "Applying patch ${patchfile}"