From fef127bed62179552bcae862715b859c6292a9ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Rodr=C3=ADguez?= Date: Wed, 16 Nov 2016 11:14:55 +0100 Subject: [PATCH] Update prestashop version to 1.6.1.9 (#28) --- bitnami/prestashop/Dockerfile | 10 +++++----- bitnami/prestashop/README.md | 16 ++++++++-------- bitnami/prestashop/docker-compose.yml | 4 +++- bitnami/prestashop/rootfs/app-entrypoint.sh | 6 ++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bitnami/prestashop/Dockerfile b/bitnami/prestashop/Dockerfile index b55921e27ac8..14b3a935171c 100644 --- a/bitnami/prestashop/Dockerfile +++ b/bitnami/prestashop/Dockerfile @@ -3,17 +3,17 @@ FROM gcr.io/stacksmith-images/minideb:jessie-r2 MAINTAINER Bitnami ENV BITNAMI_APP_NAME=prestashop \ - BITNAMI_IMAGE_VERSION=1.6.1.8-r1 \ + BITNAMI_IMAGE_VERSION=1.6.1.9-r0 \ PATH=/opt/bitnami/php/bin:/opt/bitnami/mysql/bin/:$PATH # Additional modules required -RUN bitnami-pkg unpack apache-2.4.23-8 --checksum 391deed983f7aaa04b4b47af59d8e8ced4f88076eff18d5405d196b6b270433c -RUN bitnami-pkg unpack php-5.6.27-0 --checksum d5b84af990080fb396232558ab70276af4ba85b23ccf8641b6fb11982aa7b83e +RUN bitnami-pkg unpack apache-2.4.23-9 --checksum 25bf5b82662874c21b0c0614c057d06b4a8ec14d8a76181053b691a9dfbf7f94 +RUN bitnami-pkg unpack php-5.6.28-0 --checksum 703ee1e4aa2fb1d3739633972aadae0e6620bd6c4d8520cea08f5ba9bfa589f2 RUN bitnami-pkg install libphp-5.6.27-0 --checksum f9039cc69834334187c9b55fc20bf3be818cd87a2088ced2732fead1d1bfb2d6 -RUN bitnami-pkg install mysql-client-10.1.18-0 --checksum f2f20e0512e7463996a6ad173156d249aa5ca746a1edb6c46449bd4d2736f725 +RUN bitnami-pkg install mysql-client-10.1.19-0 --checksum fdbc292bedabeaf0148d66770b8aa0ab88012ce67b459d6ba2b46446c91bb79c # Install prestashop -RUN bitnami-pkg unpack prestashop-1.6.1.8-0 --checksum 47175b98f5b9aa2657f93e49bb13e597a63e2c4390ce202ae450c40d1767cf55 +RUN bitnami-pkg unpack prestashop-1.6.1.9-0 --checksum 9b16692766efc714141b9d65cc9964f0e2ff210dce6f9d27feaaec8e6b40f5f3 COPY rootfs / diff --git a/bitnami/prestashop/README.md b/bitnami/prestashop/README.md index a237325eadde..0df56895526d 100644 --- a/bitnami/prestashop/README.md +++ b/bitnami/prestashop/README.md @@ -19,14 +19,14 @@ Running PrestaShop with a database server is the recommended way. You can either This is the recommended way to run PrestaShop. You can use the following docker compose template: -``` +```yaml version: '2' services: mariadb: image: 'bitnami/mariadb:latest' volumes: - 'mariadb_data:/bitnami/mariadb' - application: + prestashop: image: 'bitnami/prestashop:latest' ports: - '80:80' @@ -82,7 +82,7 @@ If you remove every container all your data will be lost, and the next time you ### Mount persistent folders in the host using docker-compose This requires a sightly modification from the template previously shown: -``` +```yaml version: '2' services: @@ -90,7 +90,7 @@ services: image: 'bitnami/mariadb:latest' volumes: - '/path/to/your/local/mariadb_data:/bitnami/mariadb' - application: + prestashop: image: 'bitnami/prestashop:latest' ports: - '80:80' @@ -158,8 +158,8 @@ Bitnami provides up-to-date versions of MariaDB and PrestaShop, including securi When you start the prestashop image, you can adjust the configuration of the instance by passing one or more environment variables either on the docker-compose file or on the docker run command line. If you want to add a new environment variable: * For docker-compose add the variable name and value under the application section: -``` -application: +```yaml +prestashop: image: bitnami/prestashop:latest ports: - 80:80 @@ -182,8 +182,8 @@ Available variables: - `APACHE_HTTP_PORT`: Port used by Apache for HTTP. Default: **80** - `APACHE_HTTPS_PORT`: Port used by Apache for HTTPS. Default: **443** - - `PRESTASHOP_FIRST_NAME`: PrestaShop application User's First Name. Default: **User** - - `PRESTASHOP_LAST_NAME`: PrestaShop application User's Last Name. Default: **Name** + - `PRESTASHOP_FIRST_NAME`: PrestaShop application User's First Name. Default: **Bitnami** + - `PRESTASHOP_LAST_NAME`: PrestaShop application User's Last Name. Default: **User** - `PRESTASHOP_PASSWORD`: PrestaShop application password. Default: **bitnami** - `PRESTASHOP_EMAIL`: PrestaShop application email. Default: **user@example.com** - `PRESTASHOP_HOST`: PrestaShop Host Server. diff --git a/bitnami/prestashop/docker-compose.yml b/bitnami/prestashop/docker-compose.yml index 0ecd24fe4fe1..a0d2d2b6557b 100644 --- a/bitnami/prestashop/docker-compose.yml +++ b/bitnami/prestashop/docker-compose.yml @@ -1,10 +1,11 @@ version: '2' + services: mariadb: image: 'bitnami/mariadb:latest' volumes: - 'mariadb_data:/bitnami/mariadb' - application: + prestashop: image: 'bitnami/prestashop:latest' ports: - '80:80' @@ -17,6 +18,7 @@ services: - mariadb environment: - PRESTASHOP_HOST=localhost + volumes: mariadb_data: driver: local diff --git a/bitnami/prestashop/rootfs/app-entrypoint.sh b/bitnami/prestashop/rootfs/app-entrypoint.sh index 4db38a4cd177..91fc864944a4 100755 --- a/bitnami/prestashop/rootfs/app-entrypoint.sh +++ b/bitnami/prestashop/rootfs/app-entrypoint.sh @@ -17,16 +17,14 @@ function initialize { # Set default values export APACHE_HTTP_PORT=${APACHE_HTTP_PORT:-"80"} export APACHE_HTTPS_PORT=${APACHE_HTTPS_PORT:-"443"} -export PRESTASHOP_FIRST_NAME=${PRESTASHOP_FIRST_NAME:-"User"} -export PRESTASHOP_LAST_NAME=${PRESTASHOP_LAST_NAME:-"Name"} +export PRESTASHOP_FIRST_NAME=${PRESTASHOP_FIRST_NAME:-"Bitnami"} +export PRESTASHOP_LAST_NAME=${PRESTASHOP_LAST_NAME:-"User"} export PRESTASHOP_PASSWORD=${PRESTASHOP_PASSWORD:-"bitnami"} export PRESTASHOP_EMAIL=${PRESTASHOP_EMAIL:-"user@example.com"} export MARIADB_USER=${MARIADB_USER:-"root"} export MARIADB_HOST=${MARIADB_HOST:-"mariadb"} export MARIADB_PORT=${MARIADB_PORT:-"3306"} - - if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then for module in apache php prestashop; do initialize $module