diff --git a/bitnami/appsmith/1/debian-11/Dockerfile b/bitnami/appsmith/1/debian-11/Dockerfile index e1a8d4359675..c148c6e3a3ed 100644 --- a/bitnami/appsmith/1/debian-11/Dockerfile +++ b/bitnami/appsmith/1/debian-11/Dockerfile @@ -1,15 +1,18 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-06-20T22:51:20Z" \ + org.opencontainers.image.created="2023-06-29T13:43:10Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.9.21-debian-11-r11" \ + org.opencontainers.image.ref.name="1.9.25-debian-11-r0" \ org.opencontainers.image.title="appsmith" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.9.21" + org.opencontainers.image.version="1.9.25" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -23,13 +26,13 @@ RUN install_packages acl ca-certificates curl gettext libbz2-1.0 libcom-err2 lib RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ "python-3.9.17-1-linux-${OS_ARCH}-debian-11" \ - "wait-for-port-1.0.6-8-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.5-6-linux-${OS_ARCH}-debian-11" \ - "node-16.20.0-3-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" \ - "mongodb-shell-1.10.0-0-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.21-0-linux-${OS_ARCH}-debian-11" \ + "appsmith-1.9.25-1-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -47,7 +50,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.21" \ +ENV APP_VERSION="1.9.25" \ 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 048ede7aad18..c24505e9db9c 100644 --- a/bitnami/appsmith/1/debian-11/docker-compose.yml +++ b/bitnami/appsmith/1/debian-11/docker-compose.yml @@ -1,3 +1,6 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + version: '2' services: mongodb: 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 8ea7afdd277c..18c23dfe7a98 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.21-0" + "version": "1.9.25-1" }, "java": { "arch": "amd64", @@ -15,7 +15,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.10.0-0" + "version": "1.10.1-0" }, "nginx": { "arch": "amd64", @@ -27,7 +27,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.20.0-3" + "version": "16.20.1-0" }, "python": { "arch": "amd64", @@ -39,12 +39,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.5-6" + "version": "1.0.5-7" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-8" + "version": "1.0.6-9" } } \ No newline at end of file diff --git a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 4242023f9415..184de8a117e2 100644 --- a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Bitnami custom library diff --git a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh index 41ebaf7464f6..63759c777f3b 100644 --- a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh +++ b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for managing files diff --git a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh index 801b9412bd99..96b22f99710c 100644 --- a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for file system actions @@ -42,7 +44,7 @@ ensure_dir_exists() { local owner_user="${2:-}" local owner_group="${3:-}" - mkdir -p "${dir}" + [ -d "${dir}" ] || mkdir -p "${dir}" if [[ -n $owner_user ]]; then owned_by "$dir" "$owner_user" "$owner_group" fi diff --git a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh index 9694852a7d25..dadd06149e00 100644 --- a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh +++ b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library to use for scripts expected to be used as Kubernetes lifecycle hooks diff --git a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh index c7c0f6d4422a..2a9e76a4d725 100644 --- a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh +++ b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for logging functions diff --git a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh index 8bbf165e3e2a..b47c69a56825 100644 --- a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh +++ b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for network functions diff --git a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 6d9ca8546eef..c0500acee78d 100644 --- a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for operating system actions diff --git a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh index 99df69681c27..af6af64d6dd0 100644 --- a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh +++ b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Bitnami persistence library # Used for bringing persistence capabilities to applications that don't have clear separation of data and logic diff --git a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index d70cf0779ec8..107f54e6b5c9 100644 --- a/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/appsmith/1/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 # # Library for managing services @@ -104,8 +106,6 @@ generate_cron_conf() { local schedule="* * * * *" local clean="true" - local clean="true" - # Parse optional CLI flags shift 2 while [[ "$#" -gt 0 ]]; do @@ -131,7 +131,12 @@ generate_cron_conf() { mkdir -p /etc/cron.d if "$clean"; then - echo "${schedule} ${run_as} ${cmd}" > /etc/cron.d/"$service_name" + cat > "/etc/cron.d/${service_name}" <> /etc/cron.d/"$service_name" fi @@ -187,7 +192,10 @@ generate_monit_conf() { is_boolean_yes "$disabled" && conf_suffix=".disabled" mkdir -p "$monit_conf_dir" - cat >"${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" < "${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <"${logrotate_conf_dir}/${service_name}" + cat < "${logrotate_conf_dir}/${service_name}" +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + ${log_path} { ${period} rotate ${rotations} @@ -391,6 +402,9 @@ generate_systemd_conf() { fi # Generate the Systemd unit cat > "$service_file" <