2.7.0-debian-10-r4 release

elliotdobson · Jun 3, 2021 · 6f0941b · 6f0941b
1 parent 70542dc
commit 6f0941b
Show file tree

Hide file tree

Showing 45 changed files with 4,200 additions and 796 deletions.
diff --git a/2/debian-10/Dockerfile b/2/debian-10/Dockerfile
@@ -1,60 +1,41 @@
 FROM docker.io/bitnami/minideb:buster
 LABEL maintainer "Bitnami <[email protected]>"
 
-ENV PATH="/opt/bitnami/ruby/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/git/bin:/opt/bitnami/brotli/bin:/opt/bitnami/common/bin:/opt/bitnami/nami/bin:$PATH"
+ENV HOME="/" \
+    OS_ARCH="amd64" \
+    OS_FLAVOUR="debian-10" \
+    OS_NAME="linux"
 
 COPY prebuildfs /
 # Install required system packages and dependencies
-RUN install_packages advancecomp ca-certificates curl file ghostscript gifsicle gzip hostname imagemagick jhead jpegoptim libbsd0 libc6 libcom-err2 libcurl4 libedit2 libffi6 libgcc1 libgcrypt20 libgmp-dev libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libjpeg-progs libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libncurses6 libnettle6 libnghttp2-14 libp11-kit0 libpq5 libpsl5 libreadline-dev libreadline7 librtmp1 libsasl2-2 libssh2-1 libssl-dev libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxml2-dev libxslt1-dev libxslt1.1 optipng pngcrush pngquant procps rsync sqlite3 sudo tar zlib1g zlib1g-dev
-RUN /build/bitnami-user.sh
-RUN /build/install-nami.sh
-RUN bitnami-pkg install ruby-2.6.7-0 --checksum 3d605c181d6ae44f6a6debb7c89a4dc64081b5ee28ca41354946f1fa5cd1276a
-RUN bitnami-pkg unpack postgresql-client-11.12.0-0 --checksum 94395af20a0ee9e12aaab0d1a58bb42290145af8ab7f736c4bb7cc3f51bbf2b6
-RUN bitnami-pkg install git-2.31.1-1 --checksum 81233bbb8e724b9fcc0f451a61d5120fdc101a26b40bb82307eaa2b694cdd789
-RUN bitnami-pkg unpack discourse-sidekiq-2.7.0-0 --checksum 1358b5480b0f3310f6bcd96a7fd1ea097f79f02badfde07efad2072614aa763e
-RUN bitnami-pkg install brotli-1.0.9-0 --checksum 710dd6f5c97af313d0e867e793bedc013aebe173f9c28d0fabc09a16d3100ab6
-RUN bitnami-pkg install tini-0.19.0-1 --checksum 9b1f1c095944bac88a62c1b63f3bff1bb123aa7ccd371c908c0e5b41cec2528d
-RUN bitnami-pkg install gosu-1.12.0-2 --checksum 4d858ac600c38af8de454c27b7f65c0074ec3069880cb16d259a6e40a46bbc50
-RUN bitnami-pkg unpack discourse-2.7.0-1 --checksum 0e5440460712c7fc9204fef415bc4a1bad70e517e2e3136dd1b2d429dab8001b
+RUN install_packages acl advancecomp ca-certificates curl file ghostscript gifsicle gzip hostname imagemagick jhead jpegoptim libbsd0 libbz2-1.0 libc6 libcom-err2 libcurl4 libedit2 libffi6 libgcc1 libgcrypt20 libgmp-dev libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libjpeg-turbo-progs libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libncurses6 libncursesw6 libnettle6 libnghttp2-14 libp11-kit0 libpq5 libpsl5 libreadline-dev libreadline7 librtmp1 libsasl2-2 libsqlite3-0 libssh2-1 libssl-dev libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxml2-dev libxslt1-dev libxslt1.1 optipng pngcrush pngquant procps rsync sqlite3 tar zlib1g zlib1g-dev
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wait-for-port" "1.0.0-3" --checksum 7521d9a4f9e4e182bf32977e234026caa7b03759799868335bccb1edd8f8fd12
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "uglify-js" "3.13.1-0" --checksum 0e8396efc4c2b545d48d25da5ecb42150d7035fb4fa4bc514249214c0b47048d
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "ruby" "2.7.3-0" --checksum 2d90de24a8b55a41379330d94c075beefed4f657de5edbb6d89c350b7e1b69aa
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql-client" "13.3.0-0" --checksum 1202c736e3c5b28de1dd1deb05eb2d68bd7ebccc54c9ed1eab05220f346456c3
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "node" "14.17.0-0" --checksum 445d6ffbde4c69c382f1d1614f014fb29c716756e6e91e9d5792bfb5268ea4d1
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "git" "2.31.1-1" --checksum 81233bbb8e724b9fcc0f451a61d5120fdc101a26b40bb82307eaa2b694cdd789
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "brotli" "1.0.9-0" --checksum 710dd6f5c97af313d0e867e793bedc013aebe173f9c28d0fabc09a16d3100ab6
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-2" --checksum 4d858ac600c38af8de454c27b7f65c0074ec3069880cb16d259a6e40a46bbc50
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "discourse" "2.7.0-2" --checksum 46b20e6c7e787282160d61553ebeb6501296f1fb1b469adf70ae8df3c9e76ae4
+RUN chmod g+rwX /opt/bitnami
 RUN /opt/bitnami/ruby/bin/gem install --force bundler -v '< 2'
 
 COPY rootfs /
+RUN /opt/bitnami/scripts/discourse/postunpack.sh
 ENV BITNAMI_APP_NAME="discourse" \
-    BITNAMI_IMAGE_VERSION="2.7.0-debian-10-r3" \
-    DISCOURSE_EMAIL="[email protected]" \
-    DISCOURSE_HOST="discourse" \
-    DISCOURSE_HOSTNAME="127.0.0.1" \
-    DISCOURSE_PASSENGER_SPAWN_METHOD="direct" \
-    DISCOURSE_PASSWORD="bitnami123" \
-    DISCOURSE_PORT="3000" \
-    DISCOURSE_PORT_NUMBER="3000" \
-    DISCOURSE_POSTGRESQL_NAME="bitnami_application" \
-    DISCOURSE_POSTGRESQL_PASSWORD="bitnami1" \
-    DISCOURSE_POSTGRESQL_USERNAME="bn_discourse" \
-    DISCOURSE_SITENAME="My site!" \
-    DISCOURSE_SKIP_INSTALL="no" \
-    DISCOURSE_USERNAME="user" \
-    OS_ARCH="amd64" \
-    OS_FLAVOUR="debian-10" \
-    OS_NAME="linux" \
+    BITNAMI_IMAGE_VERSION="2.7.0-debian-10-r4" \
+    PATH="/opt/bitnami/common/bin:/opt/bitnami/ruby/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/node/bin:/opt/bitnami/python/bin:/opt/bitnami/git/bin:/opt/bitnami/brotli/bin:$PATH" \
     POSTGRESQL_CLIENT_CREATE_DATABASE_NAME="" \
     POSTGRESQL_CLIENT_CREATE_DATABASE_PASSWORD="" \
     POSTGRESQL_CLIENT_CREATE_DATABASE_USERNAME="" \
     POSTGRESQL_HOST="postgresql" \
     POSTGRESQL_PORT_NUMBER="5432" \
     POSTGRESQL_ROOT_PASSWORD="" \
-    POSTGRESQL_ROOT_USER="postgres" \
-    REDIS_HOST="redis" \
-    REDIS_PASSWORD="" \
-    REDIS_PORT_NUMBER="6379" \
-    SMTP_AUTH="login" \
-    SMTP_HOST="" \
-    SMTP_PASSWORD="" \
-    SMTP_PORT="" \
-    SMTP_TLS="yes" \
-    SMTP_USER=""
+    POSTGRESQL_ROOT_USER="postgres"
 
 EXPOSE 3000
 
-ENTRYPOINT [ "/app-entrypoint.sh" ]
-CMD [ "nami", "start", "--foreground", "discourse" ]
+USER root
+ENTRYPOINT [ "/opt/bitnami/scripts/discourse/entrypoint.sh" ]
+CMD [ "/opt/bitnami/scripts/discourse/run.sh" ]
diff --git a/2/debian-10/docker-compose.yml b/2/debian-10/docker-compose.yml
@@ -2,53 +2,61 @@ version: '2'
 services:
   postgresql:
     image: docker.io/bitnami/postgresql:11
-    environment:
-      - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - 'postgresql_data:/bitnami/postgresql'
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
+      - POSTGRESQL_USERNAME=bn_discourse
+      - POSTGRESQL_DATABASE=bitnami_discourse
   redis:
     image: docker.io/bitnami/redis:6.0
     environment:
       - ALLOW_EMPTY_PASSWORD=yes
     volumes:
-      - 'redis_data:/bitnami'
+      - 'redis_data:/bitnami/discourse'
   discourse:
     image: docker.io/bitnami/discourse:2
     ports:
       - '80:3000'
+    volumes:
+      - 'discourse_data:/bitnami/discourse'
     depends_on:
       - postgresql
       - redis
-    volumes:
-      - 'discourse_data:/bitnami'
     environment:
-      - POSTGRESQL_HOST=postgresql
-      - POSTGRESQL_ROOT_USER=postgres
-      - POSTGRESQL_CLIENT_CREATE_DATABASE_NAME=bitnami_application
-      - POSTGRESQL_CLIENT_CREATE_DATABASE_USERNAME=bn_discourse
-      - POSTGRESQL_CLIENT_CREATE_DATABASE_PASSWORD=bitnami1
-      - DISCOURSE_POSTGRESQL_NAME=bitnami_application
-      - DISCOURSE_POSTGRESQL_USERNAME=bn_discourse
-      - DISCOURSE_POSTGRESQL_PASSWORD=bitnami1
-      - DISCOURSE_HOSTNAME=www.example.com
+      - ALLOW_EMPTY_PASSWORD=yes
+      - DISCOURSE_HOST=www.example.com
+      - DISCOURSE_DATABASE_HOST=postgresql
+      - DISCOURSE_DATABASE_PORT_NUMBER=5432
+      - DISCOURSE_DATABASE_USER=bn_discourse
+      - DISCOURSE_DATABASE_NAME=bitnami_discourse
+      - DISCOURSE_REDIS_HOST=redis
+      - DISCOURSE_REDIS_PORT_NUMBER=6379
+      - POSTGRESQL_CLIENT_POSTGRES_USER=postgres
+      - POSTGRESQL_CLIENT_CREATE_DATABASE_NAME=bitnami_discourse
+      - POSTGRESQL_CLIENT_CREATE_DATABASE_EXTENSIONS=hstore,pg_trgm
   sidekiq:
     image: docker.io/bitnami/discourse:2
     depends_on:
       - discourse
     volumes:
-      - 'discourse_data:/bitnami'
-    command: 'nami start --foreground discourse-sidekiq'
+      - 'sidekiq_data:/bitnami/discourse'
+    command: /opt/bitnami/scripts/discourse-sidekiq/run.sh
     environment:
-      - DISCOURSE_POSTGRESQL_NAME=bitnami_application
-      - DISCOURSE_POSTGRESQL_USERNAME=bn_discourse
-      - DISCOURSE_POSTGRESQL_PASSWORD=bitnami1
-      - DISCOURSE_HOST=discourse
-      - DISCOURSE_PORT=3000
-      - DISCOURSE_HOSTNAME=www.example.com
+      - ALLOW_EMPTY_PASSWORD=yes
+      - DISCOURSE_HOST=www.example.com
+      - DISCOURSE_DATABASE_HOST=postgresql
+      - DISCOURSE_DATABASE_PORT_NUMBER=5432
+      - DISCOURSE_DATABASE_USER=bn_discourse
+      - DISCOURSE_DATABASE_NAME=bitnami_discourse
+      - DISCOURSE_REDIS_HOST=redis
+      - DISCOURSE_REDIS_PORT_NUMBER=6379
 volumes:
   postgresql_data:
     driver: local
   redis_data:
     driver: local
   discourse_data:
     driver: local
+  sidekiq_data:
+    driver: local
diff --git a/2/debian-10/prebuildfs/build/bitnami-user.sh b/2/debian-10/prebuildfs/build/bitnami-user.sh
diff --git a/2/debian-10/prebuildfs/build/install-nami.sh b/2/debian-10/prebuildfs/build/install-nami.sh
diff --git a/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -8,17 +8,10 @@
     },
     "discourse": {
         "arch": "amd64",
-        "digest": "0e5440460712c7fc9204fef415bc4a1bad70e517e2e3136dd1b2d429dab8001b",
+        "digest": "46b20e6c7e787282160d61553ebeb6501296f1fb1b469adf70ae8df3c9e76ae4",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "2.7.0-1"
-    },
-    "discourse-sidekiq": {
-        "arch": "amd64",
-        "digest": "1358b5480b0f3310f6bcd96a7fd1ea097f79f02badfde07efad2072614aa763e",
-        "distro": "debian-10",
-        "type": "NAMI",
-        "version": "2.7.0-0"
+        "version": "2.7.0-2"
     },
     "git": {
         "arch": "amd64",
@@ -34,25 +27,39 @@
         "type": "NAMI",
         "version": "1.12.0-2"
     },
+    "node": {
+        "arch": "amd64",
+        "digest": "445d6ffbde4c69c382f1d1614f014fb29c716756e6e91e9d5792bfb5268ea4d1",
+        "distro": "debian-10",
+        "type": "NAMI",
+        "version": "14.17.0-0"
+    },
     "postgresql-client": {
         "arch": "amd64",
-        "digest": "94395af20a0ee9e12aaab0d1a58bb42290145af8ab7f736c4bb7cc3f51bbf2b6",
+        "digest": "1202c736e3c5b28de1dd1deb05eb2d68bd7ebccc54c9ed1eab05220f346456c3",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "11.12.0-0"
+        "version": "13.3.0-0"
     },
     "ruby": {
         "arch": "amd64",
-        "digest": "3d605c181d6ae44f6a6debb7c89a4dc64081b5ee28ca41354946f1fa5cd1276a",
+        "digest": "2d90de24a8b55a41379330d94c075beefed4f657de5edbb6d89c350b7e1b69aa",
+        "distro": "debian-10",
+        "type": "NAMI",
+        "version": "2.7.3-0"
+    },
+    "uglify-js": {
+        "arch": "amd64",
+        "digest": "0e8396efc4c2b545d48d25da5ecb42150d7035fb4fa4bc514249214c0b47048d",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "2.6.7-0"
+        "version": "3.13.1-0"
     },
-    "tini": {
+    "wait-for-port": {
         "arch": "amd64",
-        "digest": "9b1f1c095944bac88a62c1b63f3bff1bb123aa7ccd371c908c0e5b41cec2528d",
+        "digest": "7521d9a4f9e4e182bf32977e234026caa7b03759799868335bccb1edd8f8fd12",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "0.19.0-1"
+        "version": "1.0.0-3"
     }
 }
diff --git a/2/debian-10/prebuildfs/opt/bitnami/base/functions b/2/debian-10/prebuildfs/opt/bitnami/base/functions