New php revision that fix an issue when restoring a persisted php configuration

2026-04-05 00:37:57 +08:00 · 2017-01-24 12:24:30 +00:00
parent 62ba1818a2
commit 4718602f3f
2 changed files with 58 additions and 33 deletions
--- a/bitnami/joomla/Dockerfile
+++ b/bitnami/joomla/Dockerfile
@@ -3,17 +3,17 @@ FROM gcr.io/stacksmith-images/minideb:jessie-r8
 MAINTAINER Bitnami <containers@bitnami.com>

 ENV BITNAMI_APP_NAME=joomla \
-    BITNAMI_IMAGE_VERSION=3.6.5-r1 \
+    BITNAMI_IMAGE_VERSION=3.6.5-r2 \
    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
+# Additional modules require
+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 joomla
 RUN bitnami-pkg unpack joomla-3.6.5-0 --checksum a2bc98181e837606497fda3e8e37840270fe3d67dedd8353ddea03345dcf7b8d
--- a/bitnami/joomla/README.md
+++ b/bitnami/joomla/README.md
@@ -28,7 +28,7 @@ Running Joomla with a database server is the recommended way. You can either use

 This is the recommended way to run Joomla. You can use the following `docker-compose.yml` template:

-```
+```yaml
 version: '2'

 services:
@@ -65,22 +65,22 @@ 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:

-  ```
-  $ docker network create joomla_network
+  ```bash
+  $ docker network create joomla-tier
  ```

 2. Start a MariaDB database in the network generated:

-  ```
-  $ docker run -d --name mariadb --net=joomla_network bitnami/mariadb
+  ```bash
+  $ docker run -d --name mariadb --net joomla-tier bitnami/mariadb
  ```

  *Note:* You need to give the container a name in order to Joomla to resolve the host

 3. Run the Joomla container:

-  ```
-  $ docker run -d -p 80:80 --name joomla --net=joomla_network bitnami/joomla
+  ```bash
+  $ docker run -d -p 80:80 -p 443:443 --name joomla --net joomla-tier bitnami/joomla
  ```

 Then you can access your application at http://your-ip/
@@ -98,14 +98,14 @@ To avoid inadvertent removal of these volumes you can [mount host directories as
 ### Mount host directories as data volumes with Docker Compose

 This requires a minor change to the `docker-compose.yml` template previously shown:
-```
+```yaml
 version: '2'

 services:
  mariadb:
    image: 'bitnami/mariadb:latest'
    volumes:
-      - '/path/to/your/local/mariadb_data:/bitnami/mariadb'
+      - '/path/to/mariadb_persistence:/bitnami/mariadb'
  joomla:
    image: 'bitnami/joomla:latest'
    depends_on:
@@ -125,13 +125,13 @@ In this case you need to specify the directories to mount on the run command. Th

 1. Create a network (if it does not exist):

-  ```
+  ```bash
  $ docker network create joomla-tier
  ```

 2. Create a MariaDB container with host volume:

-  ```
+  ```bash
  $ docker run -d --name mariadb \
    --net joomla-tier \
    --volume /path/to/mariadb-persistence:/bitnami/mariadb \
@@ -142,7 +142,7 @@ In this case you need to specify the directories to mount on the run command. Th

 3. Create the Joomla container with host volumes:

-  ```
+  ```bash
  $ docker run -d --name joomla -p 80:80 -p 443:443 \
    --net joomla-tier \
    --volume /path/to/joomla-persistence:/bitnami/joomla \
@@ -157,7 +157,7 @@ Bitnami provides up-to-date versions of MariaDB and Joomla, including security p

 1. Get the updated images:

-  ```
+  ```bash
  $ docker pull bitnami/joomla:latest
  ```

@@ -185,22 +185,31 @@ Bitnami provides up-to-date versions of MariaDB and Joomla, including security p
 When you start the joomla 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:
-```
+```yaml
 joomla:
  image: bitnami/joomla:latest
  ports:
    - 80:80
+    - 443:443B
  environment:
    - JOOMLA_PASSWORD=my_password
  volumes_from:
    - joomla_data
+    - apache_data
+    - php_data
 ```

 * For manual execution add a `-e` option with each variable and value:

-```
- $ docker run -d -e JOOMLA_PASSWORD=my_password -p 80:80 --name joomla -v /your/local/path/bitnami/joomla:/bitnami/joomla --net=joomla_network bitnami/joomla
-```
+  ```bash
+  $ docker run -d --name joomla -p 80:80 -p 443:443 \
+    -e JOOMLA_PASSWORD=my_password
+    --net joomla-tier \
+    --volume /path/to/joomla-persistence:/bitnami/joomla \
+    --volume /path/to/apache-persistence:/bitnami/apache \
+    --volume /path/to/php-persistence:/bitnami/php \
+    bitnami/joomla:latest
+  ```

 Available variables:

@@ -226,23 +235,37 @@ This would be an example of SMTP configuration using a GMail account:

 * docker-compose:

-```
+```yaml
  joomla:
    image: bitnami/joomla:latest
    ports:
      - 80:80
+      - 443:443
    environment:
      - SMTP_HOST=smtp.gmail.com
      - SMTP_PORT=587
      - SMTP_USER=your_email@gmail.com
      - SMTP_PASSWORD=your_password
+    volumes_from:
+     - joomla_data
+     - apache_data
+     - php_data
 ```

 * For manual execution:

-```
- $ docker run -d -e SMTP_HOST=smtp.gmail.com -e SMTP_PORT=587 -e SMTP_USER=your_email@gmail.com -e SMTP_PASSWORD=your_password -p 80:80 --name joomla -v /your/local/path/bitnami/joomla:/bitnami/joomla --net=joomla_network bitnami/joomla
-```
+  ```bash
+  $ docker run -d --name joomla -p 80:80 -p 443:443 \
+    -e SMTP_HOST=smtp.gmail.com \
+    -e SMTP_PORT=587 \
+    -e SMTP_USER=your_email@gmail.com \
+    -e SMTP_PASSWORD=your_password
+    --net joomla-tier \
+    --volume /path/to/joomla-persistence:/bitnami/joomla \
+    --volume /path/to/apache-persistence:/bitnami/apache \
+    --volume /path/to/php-persistence:/bitnami/php \
+    bitnami/joomla:latest
+  ```

 # Backing up your application

@@ -256,7 +279,9 @@ To backup your application data follow these steps:
 2. Copy the Joomla data folder in the host:

  ```
-  $ docker cp /your/local/path/bitnami:/bitnami/joomla
+  $ docker cp /path/to/joomla-persistence:/bitnami/joomla
+  $ docker cp /path/to/apache-persistence:/bitnami/apache
+  $ docker cp /path/to/php-persistence:/bitnami/php
  ```

 # Restoring a backup
@@ -276,21 +301,21 @@ If you encountered a problem running this container, you can file an
 be sure to include the following information in your issue:

 - Host OS and version
- Docker version (`docker version`)
- Output of `docker info`
- Version of this container (`echo $BITNAMI_IMAGE_VERSION` inside the container)
+- Docker version (`$ docker version`)
+- Output of `$ docker info`
+- Version of this container (`$ echo $BITNAMI_IMAGE_VERSION` inside the container)
 - The command you used to run the container, and any relevant output you saw (masking any sensitive
 information)

 # License

-Copyright (c) 2016 Bitnami
+Copyright (c) 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
+ <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,