3.7.4-r4 release

Osclass expects an existing database to be configured with.

bitnami/osclass/3/Dockerfile

@@ -4,21 +4,29 @@ LABEL maintainer "Bitnami <containers@bitnami.com>"
 # Install required system packages and dependencies
 RUN install_packages libapr1 libaprutil1 libbz2-1.0 libc6 libcomerr2 libcurl3 libexpat1 libffi6 libfreetype6 libgcc1 libgcrypt20 libgmp10 libgnutls-deb0-28 libgpg-error0 libgssapi-krb5-2 libhogweed2 libicu52 libidn11 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmcrypt4 libncurses5 libnettle4 libp11-kit0 libpcre3 libpng12-0 libpq5 libreadline6 librtmp1 libsasl2-2 libssh2-1 libssl1.0.0 libstdc++6 libsybdb5 libtasn1-6 libtidy-0.99-0 libtinfo5 libuuid1 libxml2 libxslt1.1 zlib1g
 RUN bitnami-pkg unpack apache-2.4.29-1 --checksum 42114e87aafb1d519ab33451b6836873bca125d78ce7423c5f7f1de4a7198596
-RUN bitnami-pkg unpack php-7.1.15-0 --checksum ac172db4b32d839b9245bf2e87776eedfc56cb273ecf1c8f341f551fbbba2381
-RUN bitnami-pkg install mysql-client-10.1.31-0 --checksum c5140f9fd386782201b78559972045018928a405df324564deb392c6c61073c1
+RUN bitnami-pkg unpack php-7.1.15-1 --checksum 2cd22fa0293f483a2fc26f8bdd14c04c92067bf8d064c08acf7d33998179bf27
+RUN bitnami-pkg unpack mysql-client-10.1.31-0 --checksum c5140f9fd386782201b78559972045018928a405df324564deb392c6c61073c1
 RUN bitnami-pkg install libphp-7.1.15-0 --checksum f7573e30ebf7a686c5b0c2bc481685948c09f9f9d6da414cb1a7aaccc840d7fa
-RUN bitnami-pkg unpack osclass-3.7.4-1 --checksum f3b06b1a9dbdb41d00a7d002c2c7294cc2afae3c22a3dd0786dd3ebbe4339f67
+RUN bitnami-pkg unpack osclass-3.7.4-2 --checksum 78f2b8200bbd85ea4348bf1e9c02068ae1d704885b6e3aa91a585b5b583c2e9c
 
 COPY rootfs /
 
-ENV APACHE_HTTPS_PORT_NUMBER="443" \
+ENV ALLOW_EMPTY_PASSWORD="no" \
+    APACHE_HTTPS_PORT_NUMBER="443" \
     APACHE_HTTP_PORT_NUMBER="80" \
     BITNAMI_APP_NAME="osclass" \
-    BITNAMI_IMAGE_VERSION="3.7.4-r3" \
+    BITNAMI_IMAGE_VERSION="3.7.4-r4" \
     MARIADB_HOST="mariadb" \
-    MARIADB_PASSWORD="" \
     MARIADB_PORT_NUMBER="3306" \
-    MARIADB_USER="root" \
+    MARIADB_ROOT_PASSWORD="" \
+    MARIADB_ROOT_USER="root" \
+    MYSQL_CLIENT_CREATE_DATABASE_NAME="" \
+    MYSQL_CLIENT_CREATE_DATABASE_PASSWORD="" \
+    MYSQL_CLIENT_CREATE_DATABASE_PRIVILEGES="ALL" \
+    MYSQL_CLIENT_CREATE_DATABASE_USER="" \
+    OSCLASS_DATABASE_NAME="bitnami_osclass" \
+    OSCLASS_DATABASE_PASSWORD="" \
+    OSCLASS_DATABASE_USER="bn_osclass" \
     OSCLASS_EMAIL="user@example.com" \
     OSCLASS_HOST="127.0.0.1" \
     OSCLASS_PASSWORD="bitnami1" \

bitnami/osclass/3/docker-compose.yml

@@ -3,11 +3,20 @@ services:
   mariadb:
     image: 'bitnami/mariadb:latest'
     environment:
+      - MARIADB_USER=bn_osclass
+      - MARIADB_DATABASE=bitnami_osclass
       - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - 'mariadb_data:/bitnami'
   osclass:
     image: 'bitnami/osclass:3'
+    environment:
+      - MARIADB_HOST=mariadb
+      - MARIADB_PORT_NUMBER=3306
+      - OSCLASS_HOST=localhost
+      - OSCLASS_DATABASE_USER=bn_osclass
+      - OSCLASS_DATABASE_NAME=bitnami_osclass
+      - ALLOW_EMPTY_PASSWORD=yes
     labels:
       kompose.service.type: nodeport
     ports:

bitnami/osclass/3/rootfs/app-entrypoint.sh

@@ -6,7 +6,7 @@
 print_welcome_page
 
 if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
-  nami_initialize apache php osclass
+  nami_initialize apache php mysql-client osclass
   info "Starting osclass... "
 fi
 

bitnami/osclass/3/rootfs/mysql-client-inputs.json

@@ -0,0 +1,11 @@
+{
+  "allowEmptyPassword": "{{$global.env.ALLOW_EMPTY_PASSWORD}}",
+  "createDatabaseName": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_NAME}}",
+  "createDatabasePassword": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_PASSWORD}}",
+  "createDatabasePrivileges": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_PRIVILEGES}}",
+  "createDatabaseUser": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_USER}}",
+  "host": "{{$global.env.MARIADB_HOST}}",
+  "port": "{{$global.env.MARIADB_PORT_NUMBER}}",
+  "rootPassword": "{{$global.env.MARIADB_ROOT_PASSWORD}}",
+  "rootUser": "{{$global.env.MARIADB_ROOT_USER}}"
+}

bitnami/osclass/3/rootfs/osclass-inputs.json

@@ -1,8 +1,9 @@
 {
-  "databaseAdminPassword": "{{$global.env.MARIADB_PASSWORD}}",
-  "databaseAdminUser": "{{$global.env.MARIADB_USER}}",
+  "databaseName": "{{$global.env.OSCLASS_DATABASE_NAME}}",
+  "databasePassword": "{{$global.env.OSCLASS_DATABASE_PASSWORD}}",
   "databaseServerHost": "{{$global.env.MARIADB_HOST}}",
   "databaseServerPort": "{{$global.env.MARIADB_PORT_NUMBER}}",
+  "databaseUser": "{{$global.env.OSCLASS_DATABASE_USER}}",
   "email": "{{$global.env.OSCLASS_EMAIL}}",
   "host": "{{$global.env.OSCLASS_HOST}}",
   "password": "{{$global.env.OSCLASS_PASSWORD}}",

bitnami/osclass/README.md

@@ -206,6 +206,8 @@ You can use these snapshots to restore the application state should the upgrade
 
 The Osclass instance can be customized by specifying environment variables on the first run. The following environment values are provided to custom Osclass:
 
+##### User and Site configuration
+
 - `OSCLASS_USERNAME`: Osclass application username. Default: **user**
 - `OSCLASS_PASSWORD`: Osclass application password. Default: **bitnami1**
 - `OSCLASS_EMAIL`: Osclass application email. Default: **user@example.com**
@@ -213,10 +215,28 @@ The Osclass instance can be customized by specifying environment variables on th
 - `OSCLASS_HOST`: Osclass application IP or domain. Default: **127.0.0.1**
 - `OSCLASS_PING_ENGINES`: Allow site to appear in search engines. Default: **1**
 - `OSCLASS_SAVE_STATS`: Automatically send usage statistics and crash reports to Osclass. Default: **1**
-- `MARIADB_USER`: Root user for the MariaDB database. Default: **root**
-- `MARIADB_PASSWORD`: Root password for the MariaDB.
+
+##### Use an existing database
+
 - `MARIADB_HOST`: Hostname for MariaDB server. Default: **mariadb**
 - `MARIADB_PORT_NUMBER`: Port used by MariaDB server. Default: **3306**
+- `OSCLASS_DATABASE_NAME`: Database name that Osclass will use to connect with the database. Default: **bitnami_osclass**
+- `OSCLASS_DATABASE_USER`: Database user that Osclass will use to connect with the database. Default: **bn_osclass**
+- `OSCLASS_DATABASE_PASSWORD`: Database password that Osclass will use to connect with the database. No defaults.
+- `ALLOW_EMPTY_PASSWORD`: It can be used to allow blank passwords. Default: **no**
+
+##### Create a database for Osclass using mysql-client
+
+- `MARIADB_HOST`: Hostname for MariaDB server. Default: **mariadb**
+- `MARIADB_PORT_NUMBER`: Port used by MariaDB server. Default: **3306**
+- `MARIADB_ROOT_USER`: Database admin user. Default: **root**
+- `MARIADB_ROOT_PASSWORD`: Database password for the `MARIADB_ROOT_USER` user. No defaults.
+- `MYSQL_CLIENT_CREATE_DATABASE_NAME`: New database to be created by the mysql client module. No defaults.
+- `MYSQL_CLIENT_CREATE_DATABASE_USER`: New database user to be created by the mysql client module. No defaults.
+- `MYSQL_CLIENT_CREATE_DATABASE_PASSWORD`: Database password for the `MYSQL_CLIENT_CREATE_DATABASE_USER` user. No defaults.
+- `ALLOW_EMPTY_PASSWORD`: It can be used to allow blank passwords. Default: **no**
+
+If you want to add a new environment variable:
 
 ### Specifying Environment variables using Docker Compose
 

bitnami/osclass/circle.yml

@@ -8,8 +8,6 @@ jobs:
           RELEASE_SERIES_LIST: "3"
           LATEST_STABLE: "3"
           IMAGE_NAME: osclass
-          CHART_NAME: osclass
-          CHART_REPO: https://github.com/bitnami/charts
           EXTRA_CHART_REPOS_LIST: "https://github.com/kubernetes/charts"
           DOCKER_PROJECT: bitnami
           QUAY_PROJECT: bitnami