From f830825189802f369b726f050683f108bfd139fd Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 2 Aug 2023 10:15:18 +0200 Subject: [PATCH] [bitnami/mastodon] Release 4.1.6-debian-11-r0 (#43157) Signed-off-by: Bitnami Containers --- bitnami/mastodon/4/debian-11/Dockerfile | 25 ++++++------ .../mastodon/4/debian-11/docker-compose.yml | 1 + .../opt/bitnami/.bitnami_components.json | 14 +++---- .../opt/bitnami/scripts/libvalidations.sh | 40 ++++++++++++++++++- bitnami/mastodon/4/debian-11/tags-info.yaml | 2 +- bitnami/mastodon/docker-compose.yml | 1 + 6 files changed, 62 insertions(+), 21 deletions(-) diff --git a/bitnami/mastodon/4/debian-11/Dockerfile b/bitnami/mastodon/4/debian-11/Dockerfile index 19a5cab09a3f..03b884f51e76 100644 --- a/bitnami/mastodon/4/debian-11/Dockerfile +++ b/bitnami/mastodon/4/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-11T17:27:47Z" \ +LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-08-01T14:45:32Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.1.4-debian-11-r3" \ + org.opencontainers.image.ref.name="4.1.6-debian-11-r0" \ org.opencontainers.image.title="mastodon" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="4.1.4" + org.opencontainers.image.version="4.1.6" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -25,13 +26,13 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages acl ca-certificates curl ffmpeg file imagemagick libbsd0 libbz2-1.0 libcom-err2 libcrypt1 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libicu67 libidn11 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmd0 libncursesw6 libnettle8 libnsl2 libp11-kit0 libpq5 libreadline-dev libreadline8 libsasl2-2 libsqlite3-0 libssl-dev libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libtirpc3 libunistring2 libuuid1 libxml2 libxslt1.1 procps sqlite3 zlib1g 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-9-linux-${OS_ARCH}-debian-11" \ - "ruby-3.0.6-3-linux-${OS_ARCH}-debian-11" \ - "redis-client-7.0.12-0-linux-${OS_ARCH}-debian-11" \ - "postgresql-client-15.3.0-1-linux-${OS_ARCH}-debian-11" \ - "node-16.20.1-0-linux-${OS_ARCH}-debian-11" \ - "mastodon-4.1.4-1-linux-${OS_ARCH}-debian-11" \ + "python-3.9.17-4-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.6-11-linux-${OS_ARCH}-debian-11" \ + "ruby-3.0.6-4-linux-${OS_ARCH}-debian-11" \ + "redis-client-7.0.12-1-linux-${OS_ARCH}-debian-11" \ + "postgresql-client-15.3.0-2-linux-${OS_ARCH}-debian-11" \ + "node-16.20.1-2-linux-${OS_ARCH}-debian-11" \ + "mastodon-4.1.6-0-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -48,7 +49,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/mastodon/postunpack.sh -ENV APP_VERSION="4.1.4" \ +ENV APP_VERSION="4.1.6" \ BITNAMI_APP_NAME="mastodon" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/common/bin:/opt/bitnami/ruby/bin:/opt/bitnami/redis/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/node/bin:/opt/bitnami/mastodon/bin:$PATH" diff --git a/bitnami/mastodon/4/debian-11/docker-compose.yml b/bitnami/mastodon/4/debian-11/docker-compose.yml index e3fa09b543f7..78a6e590bc87 100644 --- a/bitnami/mastodon/4/debian-11/docker-compose.yml +++ b/bitnami/mastodon/4/debian-11/docker-compose.yml @@ -24,6 +24,7 @@ services: environment: - ELASTICSEARCH_ENABLE_SECURITY=true - ELASTICSEARCH_SKIP_TRANSPORT_TLS=true + - ELASTICSEARCH_ENABLE_REST_TLS=false - ELASTICSEARCH_PASSWORD=bitnami123 mastodon: image: docker.io/bitnami/mastodon:4 diff --git a/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index d1daa5506c72..b79d70521fda 100644 --- a/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,42 +3,42 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.1.4-1" + "version": "4.1.6-0" }, "node": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.20.1-0" + "version": "16.20.1-2" }, "postgresql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "15.3.0-1" + "version": "15.3.0-2" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.9.17-1" + "version": "3.9.17-4" }, "redis-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "7.0.12-0" + "version": "7.0.12-1" }, "ruby": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.0.6-3" + "version": "3.0.6-4" }, "wait-for-port": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-9" + "version": "1.0.6-11" } } \ No newline at end of file diff --git a/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh index 3c6a4109c2c5..54987abca42a 100644 --- a/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/mastodon/4/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/mastodon/4/debian-11/tags-info.yaml b/bitnami/mastodon/4/debian-11/tags-info.yaml index 999b40f056c9..9964825433f9 100644 --- a/bitnami/mastodon/4/debian-11/tags-info.yaml +++ b/bitnami/mastodon/4/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "4" - 4-debian-11 -- 4.1.4 +- 4.1.6 - latest diff --git a/bitnami/mastodon/docker-compose.yml b/bitnami/mastodon/docker-compose.yml index e3fa09b543f7..78a6e590bc87 100644 --- a/bitnami/mastodon/docker-compose.yml +++ b/bitnami/mastodon/docker-compose.yml @@ -24,6 +24,7 @@ services: environment: - ELASTICSEARCH_ENABLE_SECURITY=true - ELASTICSEARCH_SKIP_TRANSPORT_TLS=true + - ELASTICSEARCH_ENABLE_REST_TLS=false - ELASTICSEARCH_PASSWORD=bitnami123 mastodon: image: docker.io/bitnami/mastodon:4