From a39fa3bb352365b49e0b3f100e8e0edbc2609fcf Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 26 Aug 2019 15:40:26 +0000 Subject: [PATCH] 4.0.4-debian-9-r70 release --- bitnami/redmine/4/debian-9/Dockerfile | 7 ++- bitnami/redmine/4/debian-9/docker-compose.yml | 5 ++ .../4/debian-9/rootfs/redmine-inputs.json | 5 +- bitnami/redmine/README.md | 59 ++++++++++++------- bitnami/redmine/docker-compose-postgresql.yml | 4 ++ bitnami/redmine/docker-compose.yml | 5 ++ 6 files changed, 60 insertions(+), 25 deletions(-) diff --git a/bitnami/redmine/4/debian-9/Dockerfile b/bitnami/redmine/4/debian-9/Dockerfile index 8baf323b0c57..6fb7f53028e4 100644 --- a/bitnami/redmine/4/debian-9/Dockerfile +++ b/bitnami/redmine/4/debian-9/Dockerfile @@ -7,17 +7,18 @@ RUN bitnami-pkg install ruby-2.6.3-0 --checksum 522af3dfc94655fe0858f27bcfb5304e RUN bitnami-pkg install postgresql-client-11.5.0-0 --checksum 4798fe3bac0bfc7d5c10f3a7cb7f2ab39bd9b9551756782bfae0d56bc0d74d4b RUN bitnami-pkg install mysql-client-10.3.17-0 --checksum 71d59fafc3e7e3e598af0c2b6788d77558630afe647ec1f922ffdd5025f3d737 RUN bitnami-pkg install git-2.23.0-0 --checksum 54731b0fecdf38ab559cdd76311a229915bf0581b213a5806d3c7d56c5399981 -RUN bitnami-pkg unpack redmine-4.0.4-0 --checksum df7603446384457a9b70715e2ed5cfcad16df6c419c39ec9927a5fb7cc5424a1 +RUN bitnami-pkg unpack redmine-4.0.4-1 --checksum b206fe78004d5226a2b9e2cac864d3a8045161650f5ef582f9096e243b6dd7a2 COPY rootfs / ENV BITNAMI_APP_NAME="redmine" \ - BITNAMI_IMAGE_VERSION="4.0.4-debian-9-r69" \ + BITNAMI_IMAGE_VERSION="4.0.4-debian-9-r70" \ PATH="/opt/bitnami/ruby/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/mysql/bin:/opt/bitnami/git/bin:$PATH" \ REDMINE_DB_MYSQL="mariadb" \ + REDMINE_DB_NAME="bitnami_redmine" \ REDMINE_DB_PASSWORD="" \ REDMINE_DB_PORT_NUMBER="" \ REDMINE_DB_POSTGRES="" \ - REDMINE_DB_USERNAME="" \ + REDMINE_DB_USERNAME="bn_redmine" \ REDMINE_EMAIL="user@example.com" \ REDMINE_LANGUAGE="en" \ REDMINE_PASSWORD="bitnami1" \ diff --git a/bitnami/redmine/4/debian-9/docker-compose.yml b/bitnami/redmine/4/debian-9/docker-compose.yml index 0e5b75c7978e..8d72f0555103 100644 --- a/bitnami/redmine/4/debian-9/docker-compose.yml +++ b/bitnami/redmine/4/debian-9/docker-compose.yml @@ -4,10 +4,15 @@ services: image: 'bitnami/mariadb:10.3' environment: - ALLOW_EMPTY_PASSWORD=yes + - MARIADB_USER=bn_redmine + - MARIADB_DATABASE=bitnami_redmine volumes: - 'mariadb_data:/bitnami' redmine: image: 'bitnami/redmine:4' + environment: + - REDMINE_DB_USERNAME=bn_redmine + - REDMINE_DB_NAME=bitnami_redmine ports: - '80:3000' volumes: diff --git a/bitnami/redmine/4/debian-9/rootfs/redmine-inputs.json b/bitnami/redmine/4/debian-9/rootfs/redmine-inputs.json index 74f4969245fc..739f4a53a702 100644 --- a/bitnami/redmine/4/debian-9/rootfs/redmine-inputs.json +++ b/bitnami/redmine/4/debian-9/rootfs/redmine-inputs.json @@ -1,9 +1,10 @@ { - "databaseAdminPassword": "{{$global.env.REDMINE_DB_PASSWORD}}", - "databaseAdminUser": "{{$global.env.REDMINE_DB_USERNAME}}", "databaseMysqlHost": "{{$global.env.REDMINE_DB_MYSQL}}", + "databaseName": "{{$global.env.REDMINE_DB_NAME}}", + "databasePassword": "{{$global.env.REDMINE_DB_PASSWORD}}", "databasePostgresHost": "{{$global.env.REDMINE_DB_POSTGRES}}", "databaseServerPort": "{{$global.env.REDMINE_DB_PORT_NUMBER}}", + "databaseUser": "{{$global.env.REDMINE_DB_USERNAME}}", "email": "{{$global.env.REDMINE_EMAIL}}", "language": "{{$global.env.REDMINE_LANGUAGE}}", "password": "{{$global.env.REDMINE_PASSWORD}}", diff --git a/bitnami/redmine/README.md b/bitnami/redmine/README.md index 7329658b8c98..dbb845f7aac3 100644 --- a/bitnami/redmine/README.md +++ b/bitnami/redmine/README.md @@ -38,8 +38,8 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/). -* [`4-ol-7`, `4.0.4-ol-7-r71` (4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-redmine/blob/4.0.4-ol-7-r71/4/ol-7/Dockerfile) -* [`4-debian-9`, `4.0.4-debian-9-r69`, `4`, `4.0.4`, `4.0.4-r69`, `latest` (4/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-redmine/blob/4.0.4-debian-9-r69/4/debian-9/Dockerfile) +* [`4-ol-7`, `4.0.4-ol-7-r72` (4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-redmine/blob/4.0.4-ol-7-r72/4/ol-7/Dockerfile) +* [`4-debian-9`, `4.0.4-debian-9-r70`, `4`, `4.0.4`, `4.0.4-r70`, `latest` (4/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-redmine/blob/4.0.4-debian-9-r70/4/debian-9/Dockerfile) Subscribe to project updates by watching the [bitnami/redmine GitHub repo](https://github.com/bitnami/bitnami-docker-redmine). @@ -69,24 +69,31 @@ If you want to run the application manually instead of using docker-compose, the 1. Create a new network for the application and the database: ```bash - $ docker network create redmine_network + $ docker network create redmine-tier ``` -2. Start a MariaDB database in the network generated: - +2. Create a volume for MariaDB persistence and create a MariaDB container ```bash - $ docker run -d --name mariadb --net=redmine_network \ - -e ALLOW_EMPTY_PASSWORD=yes \ - bitnami/mariadb + $ docker volume create --name mariadb_data + $ docker run -d --name mariadb \ + -e ALLOW_EMPTY_PASSWORD=yes \ + -e MARIADB_USER=bn_redmine \ + -e MARIADB_DATABASE=bitnami_redmine \ + --net redmine-tier \ + --volume mariadb_data:/bitnami \ + bitnami/mariadb:latest ``` - *Note:* You need to give the container a name in order to Redmine to resolve the host - -3. Run the Redmine container: +3. Create volumes for Redmine persistence and launch the container ```bash - $ docker run -d --name redmine --net=redmine_network -p 80:3000 \ - bitnami/redmine + $ docker volume create --name redmine_data + $ docker run -d --name redmine -p 80:3000 \ + -e REDMINE_DB_USERNAME=bn_redmine \ + -e REDMINE_DB_NAME=bitnami_redmine \ + --net redmine-tier \ + --volume redmine_data:/bitnami \ + bitnami/redmine:latest ``` Then you can access your application at http://your-ip/ @@ -103,18 +110,23 @@ or use the next docker-compose template: ```yaml version: '2' - services: postgresql: - image: 'bitnami/postgresql:latest' + image: 'bitnami/postgresql:11' + environment: + - ALLOW_EMPTY_PASSWORD=yes + - POSTGRESQL_USERNAME=bn_redmine + - POSTGRESQL_DATABASE=bitnami_redmine volumes: - 'postgresql_data:/bitnami/postgresql' redmine: - image: 'bitnami/redmine:latest' + image: 'bitnami/redmine:4' ports: - '80:3000' environment: - REDMINE_DB_POSTGRES=postgresql + - REDMINE_DB_USERNAME=bn_redmine + - REDMINE_DB_NAME=bitnami_redmine volumes: - 'redmine_data:/bitnami' depends_on: @@ -164,8 +176,11 @@ The following `docker-compose.yml` template demonstrates the use of host directo 2. Create a MariaDB container with host volume: ```bash - $ docker run -d --name mariadb --net redmine-tier \ + $ docker run -d --name mariadb \ -e ALLOW_EMPTY_PASSWORD=yes \ + -e MARIADB_USER=bn_redmine \ + -e MARIADB_DATABASE=bitnami_redmine \ + --net redmine-tier \ --volume /path/to/mariadb-persistence:/bitnami \ bitnami/mariadb:latest ``` @@ -175,7 +190,10 @@ The following `docker-compose.yml` template demonstrates the use of host directo 3. Run the Redmine container: ```bash - $ docker run -d --name redmine -p 80:3000 --net redmine-tier \ + $ docker run -d --name redmine -p 80:3000 \ + -e REDMINE_DB_USERNAME=bn_redmine \ + -e REDMINE_DB_NAME=bitnami_redmine \ + --net redmine-tier \ --volume /path/to/redmine-persistence:/bitnami \ bitnami/redmine:latest ``` @@ -245,8 +263,9 @@ Available variables: - `REDMINE_PASSWORD`: Redmine application password. Default: **bitnami1** - `REDMINE_EMAIL`: Redmine application email. Default: **user@example.com** - `REDMINE_LANGUAGE`: Redmine application default language. Default: **en** - - `REDMINE_DB_USERNAME`: Root user for the application database. Default: **root** - - `REDMINE_DB_PASSWORD`: Root password for the database. + - `REDMINE_DB_USERNAME`: Database user the application will connect with. Default: **bn_redmine** + - `REDMINE_DB_PASSWORD`: Password for the database user. + - `REDMINE_DB_NAME`: Database the application will connect to. Default: **bitnami_redmine** - `REDMINE_DB_MYSQL`: Hostname for MySQL server. Default: **mariadb** - `REDMINE_DB_POSTGRES`: Hostname for PostgreSQL server. No defaults - `REDMINE_DB_PORT_NUMBER`: Port used by database server. Default: **3306** diff --git a/bitnami/redmine/docker-compose-postgresql.yml b/bitnami/redmine/docker-compose-postgresql.yml index a3adc0f51c70..18cb907c2ba3 100644 --- a/bitnami/redmine/docker-compose-postgresql.yml +++ b/bitnami/redmine/docker-compose-postgresql.yml @@ -4,6 +4,8 @@ services: image: 'bitnami/postgresql:11' environment: - ALLOW_EMPTY_PASSWORD=yes + - POSTGRESQL_USERNAME=bn_redmine + - POSTGRESQL_DATABASE=bitnami_redmine volumes: - 'postgresql_data:/bitnami/postgresql' redmine: @@ -12,6 +14,8 @@ services: - '80:3000' environment: - REDMINE_DB_POSTGRES=postgresql + - REDMINE_DB_USERNAME=bn_redmine + - REDMINE_DB_NAME=bitnami_redmine volumes: - 'redmine_data:/bitnami' depends_on: diff --git a/bitnami/redmine/docker-compose.yml b/bitnami/redmine/docker-compose.yml index 0e5b75c7978e..8d72f0555103 100644 --- a/bitnami/redmine/docker-compose.yml +++ b/bitnami/redmine/docker-compose.yml @@ -4,10 +4,15 @@ services: image: 'bitnami/mariadb:10.3' environment: - ALLOW_EMPTY_PASSWORD=yes + - MARIADB_USER=bn_redmine + - MARIADB_DATABASE=bitnami_redmine volumes: - 'mariadb_data:/bitnami' redmine: image: 'bitnami/redmine:4' + environment: + - REDMINE_DB_USERNAME=bn_redmine + - REDMINE_DB_NAME=bitnami_redmine ports: - '80:3000' volumes: