From 26309d7220873aeadfbb54cd0f937f76b2f61aaf Mon Sep 17 00:00:00 2001 From: Juan Ariza Toledano Date: Tue, 24 Jan 2017 10:39:34 +0000 Subject: [PATCH] New php revision that fix an issue when restoring a persisted php configuration --- bitnami/prestashop/Dockerfile | 10 +++++----- bitnami/prestashop/README.md | 30 +++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/bitnami/prestashop/Dockerfile b/bitnami/prestashop/Dockerfile index 128ed9db4b21..3e836631b665 100644 --- a/bitnami/prestashop/Dockerfile +++ b/bitnami/prestashop/Dockerfile @@ -3,17 +3,17 @@ FROM gcr.io/stacksmith-images/minideb:jessie-r8 MAINTAINER Bitnami ENV BITNAMI_APP_NAME=prestashop \ - BITNAMI_IMAGE_VERSION=1.6.1.9-r4 \ + BITNAMI_IMAGE_VERSION=1.6.1.9-r5 \ PATH=/opt/bitnami/php/bin:/opt/bitnami/mysql/bin/:$PATH # System packages required RUN install_packages libssl1.0.0 libaprutil1 libapr1 libc6 libuuid1 libexpat1 libpcre3 libldap-2.4-2 libsasl2-2 libgnutls-deb0-28 zlib1g libp11-kit0 libtasn1-6 libnettle4 libhogweed2 libgmp10 libffi6 libxslt1.1 libtidy-0.99-0 libreadline6 libncurses5 libtinfo5 libsybdb5 libmcrypt4 libstdc++6 libpng12-0 libjpeg62-turbo libbz2-1.0 libxml2 libcurl3 libfreetype6 libicu52 libgcc1 libgcrypt20 libgssapi-krb5-2 liblzma5 libidn11 librtmp1 libssh2-1 libkrb5-3 libk5crypto3 libcomerr2 libgpg-error0 libkrb5support0 libkeyutils1 # Additional modules required -RUN bitnami-pkg unpack apache-2.4.23-11 --checksum e4876fc1514082af221105319ddc8f069e7e2305dded70633bbf9a5973f2d9be -RUN bitnami-pkg unpack php-5.6.28-1 --checksum e6a6a80ccd36d3e6c4edd4c6dd97d6247534584f023bf89dda6d13728138ca37 -RUN bitnami-pkg install libphp-5.6.28-1 --checksum c7a1df270fad99fbcff23506574ec1467bac4e0f0f6d0bd34bf310446ec5d7f5 -RUN bitnami-pkg install mysql-client-10.1.19-1 --checksum 2d946c8ee3e2e845f68a5cf3751d6477d88af194d263842797fe50a44414a173 +RUN bitnami-pkg unpack apache-2.4.25-0 --checksum 8b46af7d737772d7d301da8b30a2770b7e549674e33b8a5b07480f53c39f5c3f +RUN bitnami-pkg unpack php-5.6.30-1 --checksum 96835743d668832c0b8464711587e5339969a96cafa1b319ca058697efd2857c +RUN bitnami-pkg install libphp-5.6.30-0 --checksum b9689caaab61862444c97756b1a9bf575731c4d0e71aa962d58518a231b33155 +RUN bitnami-pkg install mysql-client-10.1.21-0 --checksum 8e868a3e46bfa59f3fb4e1aae22fd9a95fd656c020614a64706106ba2eba224e # Install prestashop RUN bitnami-pkg unpack prestashop-1.6.1.9-1 --checksum 5e63a4b94965d547e1b6c6fa44f179b6a0600d839fe5b0876c9c1f81502cd6b9 diff --git a/bitnami/prestashop/README.md b/bitnami/prestashop/README.md index 95dd7ed8054a..598efe997881 100644 --- a/bitnami/prestashop/README.md +++ b/bitnami/prestashop/README.md @@ -41,6 +41,7 @@ services: volumes: - 'prestashop_data:/bitnami/prestashop' - 'apache_data:/bitnami/apache' + - 'php_data':/bitnami/php' depends_on: - mariadb volumes: @@ -50,6 +51,8 @@ volumes: driver: local apache_data: driver: local + php_data: + driver: local ``` ### Run the application manually @@ -103,14 +106,15 @@ services: - '/path/to/mariadb-persistence:/bitnami/mariadb' prestashop: image: 'bitnami/prestashop:latest' - depends_on: - - mariadb ports: - '80:80' - '443:443' volumes: - '/path/to/prestashop-persistence:/bitnami/prestashop' - '/path/to/apache-persistence/bitnami/apache' + - '/path/to/php-persistence/bitnami/apache' + depends_on: + - mariadb ``` ### Mount host directories as data volumes using the Docker command line @@ -141,6 +145,7 @@ In this case you need to specify the directories to mount on the run command. Th --network prestashop-tier \ --volume /path/to/prestashop-persistence:/bitnami/prestashop \ --volume /path/to/apache-persistence:/bitnami/apache \ + --volume /path/to/php-persistence:/bitnami/php \ bitnami/prestashop:latest ``` @@ -190,13 +195,15 @@ prestashop: - php_data:/bitnami/php ``` - * For manual execution add a `--env` option with each variable and value: + * For manual execution add a `-e` option with each variable and value: ```bash $ docker run -d --name prestashop -p 80:80 -p 443:443 \ --network prestashop-tier \ - --env PRESTASHOP_PASSWORD=my_password \ + --e PRESTASHOP_PASSWORD=my_password \ --volume /path/to/prestashop-persistence:/bitnami/prestashop \ + --volume /path/to/apache-persistence:/bitnami/apache \ + --volume /path/to/php-persistence:/bitnami/php \ bitnami/prestashop:latest ``` @@ -242,10 +249,15 @@ prestashop: * For manual execution: ```bash $ docker run -d --name prestashop -p 80:80 -p 443:443 \ + -e SMTP_HOST=smtp.gmail.com \ + -e SMTP_PORT=587 \ + -e SMTP_PROTOCOL=tls \ + -e SMTP_USER=your_email@gmail.com \ + -e SMTP_PASSWORD=your_password \ --network prestashop-tier \ --volume /path/to/prestashop-persistence:/bitnami/prestashop \ - --env SMTP_HOST=smtp.gmail.com --env SMTP_PORT=587 --env SMTP_PROTOCOL=tls \ - --env SMTP_USER=your_email@gmail.com --env SMTP_PASSWORD=your_password \ + --volume /path/to/apache-persistence:/bitnami/apache \ + --volume /path/to/php-persistence:/bitnami/php \ bitnami/prestashop:latest ``` @@ -261,7 +273,7 @@ To backup your application data follow these steps: 2. Copy the PrestaShop data folder in the host: ```bash - $ docker cp /your/local/path/bitnami:/bitnami/prestashop + $ docker cp /path/to/prestashop-persistence:/bitnami/prestashop ``` # Restoring a backup @@ -289,13 +301,13 @@ information) # License -Copyright 2016 Bitnami +Copyright 2017 Bitnami Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,