diff --git a/bitnami/appsmith/1/debian-11/Dockerfile b/bitnami/appsmith/1/debian-11/Dockerfile index 9ff194cc069e..6b187cd22c54 100644 --- a/bitnami/appsmith/1/debian-11/Dockerfile +++ b/bitnami/appsmith/1/debian-11/Dockerfile @@ -5,14 +5,15 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH -LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-07-14T15:21:48Z" \ +LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-07-18T22:36:23Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.9.25-debian-11-r5" \ + org.opencontainers.image.ref.name="1.9.27-debian-11-r0" \ org.opencontainers.image.title="appsmith" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.9.25" + org.opencontainers.image.version="1.9.27" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -25,14 +26,14 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages acl ca-certificates curl gettext libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgeoip1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libpcre3 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 openssl procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "python-3.9.17-1-linux-${OS_ARCH}-debian-11" \ + "python-3.9.17-2-linux-${OS_ARCH}-debian-11" \ "wait-for-port-1.0.6-9-linux-${OS_ARCH}-debian-11" \ "render-template-1.0.5-7-linux-${OS_ARCH}-debian-11" \ "node-16.20.1-0-linux-${OS_ARCH}-debian-11" \ - "nginx-1.25.1-0-linux-${OS_ARCH}-debian-11" \ + "nginx-1.25.1-1-linux-${OS_ARCH}-debian-11" \ "mongodb-shell-1.10.1-0-linux-${OS_ARCH}-debian-11" \ "java-17.0.7-7-2-linux-${OS_ARCH}-debian-11" \ - "appsmith-1.9.25-1-linux-${OS_ARCH}-debian-11" \ + "appsmith-1.9.27-0-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -50,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.25" \ +ENV APP_VERSION="1.9.27" \ 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 c24505e9db9c..f4c9c898c98d 100644 --- a/bitnami/appsmith/1/debian-11/docker-compose.yml +++ b/bitnami/appsmith/1/debian-11/docker-compose.yml @@ -33,7 +33,8 @@ services: volumes: - 'redis_data:/bitnami/redis' environment: - - REDIS_PASSWORD=bitmame123 + # ALLOW_EMPTY_PASSWORD is recommended only for development. + - ALLOW_EMPTY_PASSWORD=yes appsmith: image: docker.io/bitnami/appsmith:1 environment: @@ -53,7 +54,6 @@ services: - APPSMITH_DATABASE_USER=bn_appsmith - APPSMITH_DATABASE_NAME=bitnami_appsmith - APPSMITH_DATABASE_PASSWORD=bitnami123 - - APPSMITH_REDIS_PASSWORD=bitmame123 - 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 18c23dfe7a98..33276e2937d0 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.25-1" + "version": "1.9.27-0" }, "java": { "arch": "amd64", @@ -21,7 +21,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.25.1-0" + "version": "1.25.1-1" }, "node": { "arch": "amd64", @@ -33,7 +33,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.9.17-1" + "version": "3.9.17-2" }, "render-template": { "arch": "amd64", diff --git a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh index 3c6a4109c2c5..54987abca42a 100644 --- a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh @@ -187,6 +187,25 @@ validate_port() { fi } +######################## +# Validate if the provided argument is a valid IPv6 address +# Arguments: +# $1 - IP to validate +# Returns: +# Boolean +######################### +validate_ipv6() { + local ip="${1:?ip is missing}" + local stat=1 + local full_address_regex='^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$' + local short_address_regex='^((([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}){0,6}::(([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}){0,6})$' + + if [[ $ip =~ $full_address_regex || $ip =~ $short_address_regex || $ip == "::" ]]; then + stat=0 + fi + return "$stat" +} + ######################## # Validate if the provided argument is a valid IPv4 address # Arguments: @@ -204,7 +223,26 @@ validate_ipv4() { && ${ip_array[2]} -le 255 && ${ip_array[3]} -le 255 ]] stat=$? fi - return $stat + return "$stat" +} + +######################## +# Validate if the provided argument is a valid IPv4 or IPv6 address +# Arguments: +# $1 - IP to validate +# Returns: +# Boolean +######################### +validate_ip() { + local ip="${1:?ip is missing}" + local stat=1 + + if validate_ipv4 "$ip"; then + stat=0 + else + stat=$(validate_ipv6 "$ip") + fi + return "$stat" } ######################## 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 4d64105fee26..32ee7a89e1ba 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,7 +45,6 @@ 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 @@ -56,7 +55,6 @@ 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" @@ -110,8 +108,6 @@ 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 9b9d41f0ac2a..289c18a121c5 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,9 +73,6 @@ 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 @@ -332,7 +329,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_PASSWORD}@${APPSMITH_REDIS_HOST}:${APPSMITH_REDIS_PORT_NUMBER}" + appsmith_conf_set "APPSMITH_REDIS_URL" "redis://${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" diff --git a/bitnami/appsmith/1/debian-11/tags-info.yaml b/bitnami/appsmith/1/debian-11/tags-info.yaml index 0d504c1fe1ef..56d0ae97f9d5 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.25 +- 1.9.27 - latest diff --git a/bitnami/appsmith/docker-compose.yml b/bitnami/appsmith/docker-compose.yml index c24505e9db9c..f4c9c898c98d 100644 --- a/bitnami/appsmith/docker-compose.yml +++ b/bitnami/appsmith/docker-compose.yml @@ -33,7 +33,8 @@ services: volumes: - 'redis_data:/bitnami/redis' environment: - - REDIS_PASSWORD=bitmame123 + # ALLOW_EMPTY_PASSWORD is recommended only for development. + - ALLOW_EMPTY_PASSWORD=yes appsmith: image: docker.io/bitnami/appsmith:1 environment: @@ -53,7 +54,6 @@ services: - APPSMITH_DATABASE_USER=bn_appsmith - APPSMITH_DATABASE_NAME=bitnami_appsmith - APPSMITH_DATABASE_PASSWORD=bitnami123 - - APPSMITH_REDIS_PASSWORD=bitmame123 - APPSMITH_ENCRYPTION_PASSWORD=test123 - APPSMITH_ENCRYPTION_SALT=testsalt123 # Hack: This is only necessary in docker-compose