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

bitnami/osclass/Dockerfile

@@ -3,7 +3,7 @@ FROM gcr.io/stacksmith-images/minideb:jessie-r8
 MAINTAINER Bitnami <containers@bitnami.com>
 
 ENV BITNAMI_APP_NAME=osclass \
-    BITNAMI_IMAGE_VERSION=3.7.0-r3 \
+    BITNAMI_IMAGE_VERSION=3.7.0-r4 \
     PATH=/opt/bitnami/php/bin:/opt/bitnami/mysql/bin/:$PATH
 
 # System packages required
@@ -11,9 +11,9 @@ RUN install_packages libssl1.0.0 libaprutil1 libapr1 libc6 libuuid1 libexpat1 li
 
 # Additional modules required
 RUN bitnami-pkg unpack apache-2.4.25-0 --checksum 8b46af7d737772d7d301da8b30a2770b7e549674e33b8a5b07480f53c39f5c3f
-RUN bitnami-pkg unpack php-7.1.0-1 --checksum 069f80b98b29998601f10685462b2f499cd95c5c56d036b4a3d2b5f64d310028
-RUN bitnami-pkg install libphp-7.1.0-0 --checksum 7ecdcdcfcedf67d67e46260f3669bb61c18a6e062c5576ce438270a39540c98a
-RUN bitnami-pkg install mysql-client-10.1.20-0 --checksum 14d20929072b157b5e819deb440504ad0f33f583493b5adeb283c329ea58d513
+RUN bitnami-pkg unpack php-7.1.1-1 --checksum cc64828e801996f2f84d48814d8f74687ffbb0bb15f078586b2bf0a50371c7a9
+RUN bitnami-pkg install libphp-7.1.1-0 --checksum 44dcbd3692c4de97638bb8830619f3dbb555e59686804393cd0f2c6038fdcd31
+RUN bitnami-pkg install mysql-client-10.1.21-0 --checksum 8e868a3e46bfa59f3fb4e1aae22fd9a95fd656c020614a64706106ba2eba224e
 
 # Install osclass
 RUN bitnami-pkg unpack osclass-3.7.0-0 --checksum dd52e917849b17e0e665d29c5912edb833b9d2c56e392df52a982716bf26b7ea

bitnami/osclass/README.md

@@ -44,7 +44,7 @@ services:
     volumes:
       - osclass_data:/bitnami/osclass
       - apache_data:/bitnami/apache
-
+      - php_data:/bitnami/php
 volumes:
   mariadb_data:
     driver: local
@@ -52,6 +52,8 @@ volumes:
     driver: local
   apache_data:
     driver: local
+  php_data:
+    driver: local
 ```
 
 Launch the containers using:
@@ -85,10 +87,12 @@ If you want to run the application manually instead of using `docker-compose`, t
   ```bash
   $ docker volume create --name osclass_data
   $ docker volume create --name apache_data
+  $ docker volume create --name php_data
   $ docker run -d --name osclass -p 80:80 -p 443:443 \
     --net osclass-tier \
     --volume osclass_data:/bitnami/osclass \
     --volume apache_data:/bitnami/apache \
+    --volume php_data:/bitnami/php \
     bitnami/osclass:latest
   ```
 
@@ -126,6 +130,7 @@ services:
     volumes:
       - /path/to/osclass-persistence:/bitnami/osclass
       - /path/to/apache-persistence:/bitnami/apache
+      - /path/to/php-persistence:/bitnami/php
 ```
 
 ### Mount host directories as data volumes using the Docker command line
@@ -149,6 +154,7 @@ services:
     --net osclass-tier \
     --volume /path/to/osclass-persistence:/bitnami/osclass \
     --volume /path/to/apache-persistence:/bitnami/apache \
+    --volume /path/to/php-persistence:/bitnami/php \
     bitnami/osclass:latest
   ```
 
@@ -199,6 +205,7 @@ $ docker pull bitnami/osclass:latest
     --net osclass-tier \
     --volume osclass_data:/bitnami/osclass \
     --volume apache_data:/bitnami/apache \
+    --volume php_data:/bitnami/php \
     bitnami/osclass:latest
   ```
 
@@ -246,7 +253,7 @@ services:
     volumes:
       - osclass_data:/bitnami/osclass
       - apache_data:/bitnami/apache
-
+      - php_data:/bitnami/php
 volumes:
   mariadb_data:
     driver: local
@@ -254,6 +261,8 @@ volumes:
     driver: local
   apache_data:
     driver: local
+  php_data:
+    driver: local
 ```
 
 ### Specifying Environment variables on the Docker command line
@@ -264,6 +273,7 @@ $ docker run -d --name osclass -p 80:80 -p 443:443 \
   --env OSCLASS_PASSWORD=my_password \
   --volume osclass_data:/bitnami/osclass \
   --volume apache_data:/bitnami/apache \
+  --volume php_data:/bitnami/php \
   bitnami/osclass:latest
 ```
 
@@ -280,7 +290,7 @@ This would be an example of SMTP configuration using a GMail account:
 
  * docker-compose (application part):
 
-```
+```yaml
   osclass:
     image: bitnami/osclass:latest
     ports:
@@ -293,18 +303,25 @@ This would be an example of SMTP configuration using a GMail account:
       - SMTP_PROTOCOL=tls
     volumes:
       - osclass_data:/bitnami/osclass
+      - apache_data:/bitnami/apache
+      - php_data:/bitnami/php
 ```
 
 * For manual execution:
 
-```
-$ docker run -d --name osclass -p 80:80 -p 443:443 \
-  --net osclass-tier \
-  --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 osclass_data:/bitnami/osclass \
-  bitnami/osclass:latest
-```
+  ```bash
+  $ docker run -d --name osclass -p 80:80 -p 443:443 \
+    --net osclass-tier \
+    -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 \
+    --volume osclass_data:/bitnami/osclass \
+    --volume apache_data:/bitnami/apache \
+    --volume php_data:/bitnami/php \
+    bitnami/osclass:latest
+  ```
 
 
 # Backing up your application
@@ -318,10 +335,11 @@ To backup your application data follow these steps:
   $ docker-compose stop osclass
   ```
 
-2. Copy the Osclass and Apache data
+2. Copy the Osclass, php and Apache data
   ```bash
   $ docker cp $(docker-compose ps -q osclass):/bitnami/osclass/ /path/to/backups/osclass/latest/
   $ docker cp $(docker-compose ps -q osclass):/bitnami/apache/ /path/to/backups/apache/latest/
+  $ docker cp $(docker-compose ps -q osclass):/bitnami/php/ /path/to/backups/php/latest/
   ```
 
 3. Start the Osclass container
@@ -336,10 +354,11 @@ To backup your application data follow these steps:
   $ docker stop osclass
   ```
 
-2. Copy the Osclass and Apache data
+2. Copy the Osclass, php and Apache data
   ```bash
   $ docker cp osclass:/bitnami/osclass/ /path/to/backups/osclass/latest/
   $ docker cp osclass:/bitnami/apache/ /path/to/backups/apache/latest/
+  $ docker cp osclass:/bitnami/php/ /path/to/backups/php/latest/
   ```
 
 3. Start the Osclass container
@@ -360,20 +379,20 @@ We'd love for you to contribute to this container. You can request new features
 If you encountered a problem running this container, you can file an [issue](https://github.com/bitnami/bitnami-docker-osclass/issues). For us to provide better support, 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) 2015-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,