From d8f4ce452085f72a08174fee29c4c3641ad99389 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 9 Aug 2023 15:55:44 +0200 Subject: [PATCH] [bitnami/appsmith] Release 1.9.31-debian-11-r0 (#44026) Signed-off-by: Bitnami Containers --- bitnami/appsmith/1/debian-11/Dockerfile | 10 +++++----- bitnami/appsmith/1/debian-11/docker-compose.yml | 4 ++-- .../prebuildfs/opt/bitnami/.bitnami_components.json | 2 +- .../rootfs/opt/bitnami/scripts/appsmith-env.sh | 4 ++++ .../rootfs/opt/bitnami/scripts/libappsmith.sh | 9 ++++----- bitnami/appsmith/1/debian-11/tags-info.yaml | 2 +- bitnami/appsmith/docker-compose.yml | 4 ++-- 7 files changed, 19 insertions(+), 16 deletions(-) diff --git a/bitnami/appsmith/1/debian-11/Dockerfile b/bitnami/appsmith/1/debian-11/Dockerfile index 9c4c6785c5da..fefde7a06889 100644 --- a/bitnami/appsmith/1/debian-11/Dockerfile +++ b/bitnami/appsmith/1/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-08-09T01:30:04Z" \ + org.opencontainers.image.created="2023-08-09T12:18:57Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.9.29-debian-11-r15" \ + org.opencontainers.image.ref.name="1.9.31-debian-11-r0" \ org.opencontainers.image.title="appsmith" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.9.29" + org.opencontainers.image.version="1.9.31" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -33,7 +33,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ "nginx-1.25.1-2-linux-${OS_ARCH}-debian-11" \ "mongodb-shell-1.10.3-0-linux-${OS_ARCH}-debian-11" \ "java-17.0.8-7-2-linux-${OS_ARCH}-debian-11" \ - "appsmith-1.9.29-1-linux-${OS_ARCH}-debian-11" \ + "appsmith-1.9.31-0-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -51,7 +51,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/nginx/postunpack.sh RUN /opt/bitnami/scripts/appsmith/postunpack.sh -ENV APP_VERSION="1.9.29" \ +ENV APP_VERSION="1.9.31" \ BITNAMI_APP_NAME="appsmith" \ NGINX_HTTPS_PORT_NUMBER="" \ NGINX_HTTP_PORT_NUMBER="" \ diff --git a/bitnami/appsmith/1/debian-11/docker-compose.yml b/bitnami/appsmith/1/debian-11/docker-compose.yml index f4c9c898c98d..c5c3e4465854 100644 --- a/bitnami/appsmith/1/debian-11/docker-compose.yml +++ b/bitnami/appsmith/1/debian-11/docker-compose.yml @@ -33,8 +33,7 @@ services: volumes: - 'redis_data:/bitnami/redis' environment: - # ALLOW_EMPTY_PASSWORD is recommended only for development. - - ALLOW_EMPTY_PASSWORD=yes + - REDIS_PASSWORD=bitnami123 appsmith: image: docker.io/bitnami/appsmith:1 environment: @@ -54,6 +53,7 @@ services: - APPSMITH_DATABASE_USER=bn_appsmith - APPSMITH_DATABASE_NAME=bitnami_appsmith - APPSMITH_DATABASE_PASSWORD=bitnami123 + - APPSMITH_REDIS_PASSWORD=bitnami123 - APPSMITH_ENCRYPTION_PASSWORD=test123 - APPSMITH_ENCRYPTION_SALT=testsalt123 # Hack: This is only necessary in docker-compose diff --git a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 039311df25a6..975e3e7b8759 100644 --- a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.9.29-1" + "version": "1.9.31-0" }, "java": { "arch": "amd64", diff --git a/bitnami/appsmith/1/debian-11/rootfs/opt/bitnami/scripts/appsmith-env.sh b/bitnami/appsmith/1/debian-11/rootfs/opt/bitnami/scripts/appsmith-env.sh index 32ee7a89e1ba..4d64105fee26 100644 --- a/bitnami/appsmith/1/debian-11/rootfs/opt/bitnami/scripts/appsmith-env.sh +++ b/bitnami/appsmith/1/debian-11/rootfs/opt/bitnami/scripts/appsmith-env.sh @@ -45,6 +45,7 @@ appsmith_env_vars=( APPSMITH_DATABASE_INIT_DELAY APPSMITH_REDIS_HOST APPSMITH_REDIS_PORT_NUMBER + APPSMITH_REDIS_PASSWORD APPSMITH_STARTUP_TIMEOUT APPSMITH_STARTUP_ATTEMPTS APPSMITH_DATA_TO_PERSIST @@ -55,6 +56,7 @@ appsmith_env_vars=( MONGODB_DATABASE_PASSWORD REDIS_HOST REDIS_PORT_NUMBER + REDIS_PASSWORD ) for env_var in "${appsmith_env_vars[@]}"; do file_env_var="${env_var}_FILE" @@ -108,6 +110,8 @@ APPSMITH_REDIS_HOST="${APPSMITH_REDIS_HOST:-"${REDIS_HOST:-}"}" export APPSMITH_REDIS_HOST="${APPSMITH_REDIS_HOST:-redis}" # only used during the first initialization APPSMITH_REDIS_PORT_NUMBER="${APPSMITH_REDIS_PORT_NUMBER:-"${REDIS_PORT_NUMBER:-}"}" export APPSMITH_REDIS_PORT_NUMBER="${APPSMITH_REDIS_PORT_NUMBER:-6379}" # only used during the first initialization +APPSMITH_REDIS_PASSWORD="${APPSMITH_REDIS_PASSWORD:-"${REDIS_PASSWORD:-}"}" +export APPSMITH_REDIS_PASSWORD="${APPSMITH_REDIS_PASSWORD:-}" # only used during the first initialization export APPSMITH_STARTUP_TIMEOUT="${APPSMITH_STARTUP_TIMEOUT:-120}" export APPSMITH_STARTUP_ATTEMPTS="${APPSMITH_STARTUP_ATTEMPTS:-5}" export APPSMITH_DATA_TO_PERSIST="${APPSMITH_DATA_TO_PERSIST:-$APPSMITH_CONF_FILE}" diff --git a/bitnami/appsmith/1/debian-11/rootfs/opt/bitnami/scripts/libappsmith.sh b/bitnami/appsmith/1/debian-11/rootfs/opt/bitnami/scripts/libappsmith.sh index 289c18a121c5..1c8a99008880 100644 --- a/bitnami/appsmith/1/debian-11/rootfs/opt/bitnami/scripts/libappsmith.sh +++ b/bitnami/appsmith/1/debian-11/rootfs/opt/bitnami/scripts/libappsmith.sh @@ -73,6 +73,9 @@ appsmith_validate() { if [[ "$APPSMITH_MODE" != "client" ]]; then is_empty_value "${APPSMITH_DATABASE_PASSWORD}" && print_validation_error "The APPSMITH_DATABASE_PASSWORD environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow a blank password. This is only recommended for development environments." fi + if [[ "$APPSMITH_MODE" == "backend" ]]; then + is_empty_value "${APPSMITH_REDIS_PASSWORD}" && print_validation_error "The APPSMITH_REDIS_PASSWORD environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow a blank password. This is only recommended for development environments." + fi fi if [[ "$APPSMITH_MODE" == "backend" ]]; then @@ -329,7 +332,7 @@ appsmith_initialize() { # https://github.com/appsmithorg/appsmith/blob/release/app/server/appsmith-server/src/main/resources/application.properties appsmith_conf_set "APPSMITH_MONGODB_PASSWORD" "$APPSMITH_DATABASE_PASSWORD" appsmith_conf_set "APPSMITH_MONGODB_USER" "$APPSMITH_DATABASE_USER" - appsmith_conf_set "APPSMITH_REDIS_URL" "redis://${APPSMITH_REDIS_HOST}:${APPSMITH_REDIS_PORT_NUMBER}" + appsmith_conf_set "APPSMITH_REDIS_URL" "redis://:${APPSMITH_REDIS_PASSWORD}@${APPSMITH_REDIS_HOST}:${APPSMITH_REDIS_PORT_NUMBER}" appsmith_conf_set "APPSMITH_ENCRYPTION_PASSWORD" "$APPSMITH_ENCRYPTION_PASSWORD" appsmith_conf_set "APPSMITH_ENCRYPTION_SALT" "$APPSMITH_ENCRYPTION_SALT" info "Ensuring Appsmith directories exist" @@ -443,10 +446,6 @@ appsmith_unset_unused_variables() { unset APPSMITH_OAUTH2_GOOGLE_CLIENT_SECRET fi - if [[ -z "${APPSMITH_GOOGLE_MAPS_API_KEY}" ]]; then - unset APPSMITH_GOOGLE_MAPS_API_KEY - fi - if [[ -z "${APPSMITH_RECAPTCHA_SITE_KEY}" ]] || [[ -z "${APPSMITH_RECAPTCHA_SECRET_KEY}" ]] || [[ -z "${APPSMITH_RECAPTCHA_ENABLED}" ]]; then unset APPSMITH_RECAPTCHA_SITE_KEY unset APPSMITH_RECAPTCHA_SECRET_KEY diff --git a/bitnami/appsmith/1/debian-11/tags-info.yaml b/bitnami/appsmith/1/debian-11/tags-info.yaml index b9ec6285e943..cb7498e2ceca 100644 --- a/bitnami/appsmith/1/debian-11/tags-info.yaml +++ b/bitnami/appsmith/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.9.29 +- 1.9.31 - latest diff --git a/bitnami/appsmith/docker-compose.yml b/bitnami/appsmith/docker-compose.yml index f4c9c898c98d..c5c3e4465854 100644 --- a/bitnami/appsmith/docker-compose.yml +++ b/bitnami/appsmith/docker-compose.yml @@ -33,8 +33,7 @@ services: volumes: - 'redis_data:/bitnami/redis' environment: - # ALLOW_EMPTY_PASSWORD is recommended only for development. - - ALLOW_EMPTY_PASSWORD=yes + - REDIS_PASSWORD=bitnami123 appsmith: image: docker.io/bitnami/appsmith:1 environment: @@ -54,6 +53,7 @@ services: - APPSMITH_DATABASE_USER=bn_appsmith - APPSMITH_DATABASE_NAME=bitnami_appsmith - APPSMITH_DATABASE_PASSWORD=bitnami123 + - APPSMITH_REDIS_PASSWORD=bitnami123 - APPSMITH_ENCRYPTION_PASSWORD=test123 - APPSMITH_ENCRYPTION_SALT=testsalt123 # Hack: This is only necessary in docker-compose