3.7.4-ol-7-r0 release

Osclass expects an existing database to be configured with.
This commit is contained in:
Bitnami Bot 2018-05-29 16:53:06 +00:00
parent b250eb6f6a
commit 5dda0de691
9 changed files with 163 additions and 1 deletions

View File

@ -0,0 +1,46 @@
FROM bitnami/oraclelinux-extras:7-r3
LABEL maintainer "Bitnami <containers@bitnami.com>"
# Install required system packages and dependencies
RUN install_packages bzip2-libs cyrus-sasl-lib expat freetype glibc gmp keyutils-libs krb5-libs libcom_err libcurl libgcc libgcrypt libgpg-error libicu libidn libjpeg-turbo libpng libselinux libssh2 libstdc++ libxml2 libxslt ncurses-libs nspr nss nss-softokn-freebl nss-util openldap openssl-libs pcre postgresql-libs readline sqlite xz-libs zlib
RUN bitnami-pkg unpack apache-2.4.33-3 --checksum 0611709446389dbf1b9a08ee4b8b447443e356e286a9c6dee312d55f72e465d6
RUN bitnami-pkg unpack php-7.1.18-0 --checksum ea15f7691a9da4e1613a18f5f49c5cc48b84bdd849d1ce27ea5e5e2dc99029dc
RUN bitnami-pkg unpack mysql-client-10.1.33-0 --checksum 250e5cd0f6f256fb39e8d8b703856dbc0257f3da9659b8565398173a3119dd9c
RUN bitnami-pkg install libphp-7.1.18-1 --checksum 538f68d6d196c3a58cc6147878f644ccc5055a916bb8693c349f5245fff164ee
RUN bitnami-pkg unpack osclass-3.7.4-2 --checksum 39a9fb2d0392cf7c6f2377ce0efad6c01c86e0dd60d4c532f715cb6ca0189ab7
COPY rootfs /
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-ol-7-r0" \
MARIADB_HOST="mariadb" \
MARIADB_PORT_NUMBER="3306" \
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" \
OSCLASS_PING_ENGINES="1" \
OSCLASS_SAVE_STATS="1" \
OSCLASS_USERNAME="user" \
OSCLASS_WEB_TITLE="Sample Web Page" \
PATH="/opt/bitnami/apache/bin:/opt/bitnami/php/bin:/opt/bitnami/mysql/bin:$PATH" \
SMTP_HOST="" \
SMTP_PASSWORD="" \
SMTP_PORT="" \
SMTP_PROTOCOL="" \
SMTP_USER=""
EXPOSE 80 443
ENTRYPOINT ["/app-entrypoint.sh"]
CMD ["nami","start","--foreground","apache"]

View File

@ -0,0 +1,31 @@
version: '2'
services:
mariadb:
image: 'bitnami/mariadb:10.1-ol-7'
environment:
- MARIADB_USER=bn_osclass
- MARIADB_DATABASE=bitnami_osclass
- ALLOW_EMPTY_PASSWORD=yes
volumes:
- 'mariadb_data:/bitnami'
osclass:
image: 'bitnami/osclass:3-ol-7'
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
ports:
- '80:80'
- '443:443'
depends_on:
- mariadb
volumes:
- 'osclass_data:/bitnami'
volumes:
mariadb_data:
driver: local
osclass_data:
driver: local

View File

@ -0,0 +1,4 @@
{
"httpPort": "{{$global.env.APACHE_HTTP_PORT_NUMBER}}",
"httpsPort": "{{$global.env.APACHE_HTTPS_PORT_NUMBER}}"
}

View File

@ -0,0 +1,14 @@
#!/bin/bash -e
. /opt/bitnami/base/functions
. /opt/bitnami/base/helpers
print_welcome_page
if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
. /init.sh
nami_initialize apache php mysql-client osclass
info "Starting osclass... "
fi
exec tini -- "$@"

View File

@ -0,0 +1,29 @@
##
## @brief Helper function to show an error when a password is empty and exit
## param $1 Input name
##
empty_password_error() {
error "The $1 environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow the container to be started with blank passwords. This is recommended only for development."
exit 1
}
##
## @brief Helper function to show a warning when the ALLOW_EMPTY_PASSWORD flag is enabled
##
empty_password_enabled_warn() {
warn "You set the environment variable ALLOW_EMPTY_PASSWORD=${ALLOW_EMPTY_PASSWORD}. For safety reasons, do not use this flag in a production environment."
}
# Validate passwords
if [[ "$ALLOW_EMPTY_PASSWORD" =~ ^(yes|Yes|YES)$ ]]; then
empty_password_enabled_warn
else
# Database creation by MySQL client
if [[ -n "$MYSQL_CLIENT_CREATE_DATABASE_USER" && -z "$MYSQL_CLIENT_CREATE_DATABASE_PASSWORD" ]]; then
empty_password_error MYSQL_CLIENT_CREATE_DATABASE_PASSWORD
fi
# Osclass database
if [[ -z "$OSCLASS_DATABASE_PASSWORD" ]]; then
empty_password_error OSCLASS_DATABASE_PASSWORD
fi
fi

View File

@ -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}}"
}

View File

@ -0,0 +1,19 @@
{
"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}}",
"pingEngines": "{{$global.env.OSCLASS_PING_ENGINES}}",
"saveStats": "{{$global.env.OSCLASS_SAVE_STATS}}",
"smtpHost": "{{$global.env.SMTP_HOST}}",
"smtpPassword": "{{$global.env.SMTP_PASSWORD}}",
"smtpPort": "{{$global.env.SMTP_PORT}}",
"smtpProtocol": "{{$global.env.SMTP_PROTOCOL}}",
"smtpUser": "{{$global.env.SMTP_USER}}",
"username": "{{$global.env.OSCLASS_USERNAME}}",
"webTitle": "{{$global.env.OSCLASS_WEB_TITLE}}"
}

View File

@ -23,6 +23,13 @@ $ docker-compose up -d
* Bitnami images are built on CircleCI and automatically pushed to the Docker Hub.
* All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading linux distribution.
# Supported tags and respective `Dockerfile` links
* [`3`, `3.7.4-r29`, `latest` (3/Dockerfile)](https://github.com/bitnami/bitnami-docker-osclass/blob/3.7.4-r29/3/Dockerfile)
* [`3-ol-7`, `3.7.4-ol-7-r0` (3/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-osclass/blob/3.7.4-ol-7-r0/3/ol-7/Dockerfile)
Subscribe to project updates by watching the [bitnami/osclass GitHub repo](https://github.com/bitnami/bitnami-docker-osclass).
# Prerequisites
To run this application you need [Docker Engine](https://www.docker.com/products/docker-engine) >= `1.10.0`. [Docker Compose](https://www.docker.com/products/docker-compose) is recommended with a version `1.6.0` or later.

View File

@ -7,6 +7,7 @@ jobs:
environment:
RELEASE_SERIES_LIST: "3"
LATEST_STABLE: "3"
DISTRIBUTIONS_LIST: "debian-8,ol-7"
IMAGE_NAME: osclass
CHART_NAME: osclass
CHART_REPO: https://github.com/kubernetes/charts
@ -63,4 +64,4 @@ workflows:
branches:
only: /.*/
tags:
only: /^[0-9].*-r[0-9]+$/
only: /^[0-9].*-r[0-9]+(-(?!rhel).*)?$/