From 9228376a94780bebe1bd437c4f399081e810ca1e Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 31 May 2017 09:35:30 +0000 Subject: [PATCH] 2.3.0.2-r18 release Update image to version 2.3.0.2-r18 --- bitnami/opencart/2/Dockerfile | 14 +++++++++----- bitnami/opencart/2/rootfs/apache-inputs.json | 4 ++-- bitnami/opencart/2/rootfs/opencart-inputs.json | 2 +- bitnami/opencart/README.md | 4 ++-- bitnami/opencart/circle.yml | 2 +- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/bitnami/opencart/2/Dockerfile b/bitnami/opencart/2/Dockerfile index 6056bf5264af..e889d3404445 100644 --- a/bitnami/opencart/2/Dockerfile +++ b/bitnami/opencart/2/Dockerfile @@ -1,6 +1,8 @@ -FROM bitnami/minideb-extras:jessie-r15 +FROM bitnami/minideb-extras:jessie-r16 LABEL maintainer "Bitnami " + + # 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.25-0 --checksum 8b46af7d737772d7d301da8b30a2770b7e549674e33b8a5b07480f53c39f5c3f @@ -11,13 +13,13 @@ RUN bitnami-pkg unpack opencart-2.3.0.2-3 --checksum 92e9d059beff6cea9df091cc197 COPY rootfs / -ENV APACHE_HTTPS_PORT="443" \ - APACHE_HTTP_PORT="80" \ +ENV APACHE_HTTPS_PORT_NUMBER="443" \ + APACHE_HTTP_PORT_NUMBER="80" \ BITNAMI_APP_NAME="opencart" \ - BITNAMI_IMAGE_VERSION="2.3.0.2-r17" \ + BITNAMI_IMAGE_VERSION="2.3.0.2-r18" \ MARIADB_HOST="mariadb" \ MARIADB_PASSWORD="" \ - MARIADB_PORT="3306" \ + MARIADB_PORT_NUMBER="3306" \ MARIADB_USER="root" \ OPENCART_EMAIL="user@example.com" \ OPENCART_HOST="127.0.0.1" \ @@ -30,6 +32,8 @@ ENV APACHE_HTTPS_PORT="443" \ SMTP_PROTOCOL="" \ SMTP_USER="" + + VOLUME ["/bitnami/apache","/bitnami/opencart","/bitnami/php"] EXPOSE 80 443 diff --git a/bitnami/opencart/2/rootfs/apache-inputs.json b/bitnami/opencart/2/rootfs/apache-inputs.json index 2351b006ed67..493f9fc7b0fa 100644 --- a/bitnami/opencart/2/rootfs/apache-inputs.json +++ b/bitnami/opencart/2/rootfs/apache-inputs.json @@ -1,4 +1,4 @@ { - "httpPort": "{{$global.env.APACHE_HTTP_PORT}}", - "httpsPort": "{{$global.env.APACHE_HTTPS_PORT}}" + "httpPort": "{{$global.env.APACHE_HTTP_PORT_NUMBER}}", + "httpsPort": "{{$global.env.APACHE_HTTPS_PORT_NUMBER}}" } \ No newline at end of file diff --git a/bitnami/opencart/2/rootfs/opencart-inputs.json b/bitnami/opencart/2/rootfs/opencart-inputs.json index fb76eefa884c..c5a01f1dfa7a 100644 --- a/bitnami/opencart/2/rootfs/opencart-inputs.json +++ b/bitnami/opencart/2/rootfs/opencart-inputs.json @@ -2,7 +2,7 @@ "databaseAdminPassword": "{{$global.env.MARIADB_PASSWORD}}", "databaseAdminUser": "{{$global.env.MARIADB_USER}}", "databaseServerHost": "{{$global.env.MARIADB_HOST}}", - "databaseServerPort": "{{$global.env.MARIADB_PORT}}", + "databaseServerPort": "{{$global.env.MARIADB_PORT_NUMBER}}", "email": "{{$global.env.OPENCART_EMAIL}}", "host": "{{$global.env.OPENCART_HOST}}", "password": "{{$global.env.OPENCART_PASSWORD}}", diff --git a/bitnami/opencart/README.md b/bitnami/opencart/README.md index 25e32260befc..a952b28dfa6e 100644 --- a/bitnami/opencart/README.md +++ b/bitnami/opencart/README.md @@ -18,7 +18,7 @@ $ docker-compose up ## Kubernetes -> **WARNING**: This is a beta configuration, currently unsupported. +> **WARNING:** This is a beta configuration, currently unsupported. Get the raw URL pointing to the kubernetes.yml manifest and use kubectl to create the resources on your Kubernetes cluster like so: @@ -240,7 +240,7 @@ Available variables: - `OPENCART_HOST`: OpenCart Host Server. - `MARIADB_PASSWORD`: Root password for the MariaDB. - `MARIADB_HOST`: Hostname for MariaDB server. Default: **mariadb** - - `MARIADB_PORT`: Port used by MariaDB server. Default: **3306** + - `MARIADB_PORT_NUMBER`: Port used by MariaDB server. Default: **3306** ## SMTP Configuration diff --git a/bitnami/opencart/circle.yml b/bitnami/opencart/circle.yml index 5d42be10de6a..a16cfd029b23 100644 --- a/bitnami/opencart/circle.yml +++ b/bitnami/opencart/circle.yml @@ -5,7 +5,7 @@ machine: RELEASE_SERIES_LIST: 2 LATEST_STABLE: 2 IMAGE_NAME: opencart - CHART_NAME: opencart + CHART_NAME: CHART_REPO: https://github.com/kubernetes/charts DOCKER_PROJECT: bitnami QUAY_PROJECT: bitnami