From 80e82e7626e9193acb016f43563f6a84fb55dc6e Mon Sep 17 00:00:00 2001
From: Hardware <contact@meshup.net>
Date: Sat, 22 Jul 2017 09:45:12 +0200
Subject: [PATCH] chore(): update to v0.1.0-beta.7

---
 Dockerfile |  7 +------
 README.md  | 12 ++++++------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 870cdc8..dcb3a31 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM wonderfall/nginx-php
 LABEL description "Next-generation forum software that makes online discussion fun" \
       maintainer="Hardware <hardware@mondedie.fr>, Magicalex <magicalex@mondedie.fr>"
 
-ARG VERSION=v0.1.0-beta.6
+ARG VERSION=v0.1.0-beta.7
 
 ENV GID=991 UID=991 UPLOAD_MAX_SIZE=50M MEMORY_LIMIT=128M
 
@@ -15,11 +15,6 @@ RUN apk add -U curl \
  && mkdir -p /flarum/app \
  && chown -R $UID:$GID /flarum \
  && COMPOSER_CACHE_DIR="/tmp" su-exec $UID:$GID composer create-project flarum/flarum /flarum/app $VERSION --stability=beta \
- # ----- Zend stratigility deprecated message temporary fix -----
- # https://github.com/flarum/core/issues/1065
- && rm -f /flarum/app/composer.lock \
- && COMPOSER_CACHE_DIR="/tmp" su-exec $UID:$GID composer require zendframework/zend-stratigility:1.2.* -d /flarum/app \
- # --------------------------------------------------------------
  && composer clear-cache \
  && rm -rf /flarum/.composer /var/cache/apk/*
 
diff --git a/README.md b/README.md
index aa14e5a..621d179 100644
--- a/README.md
+++ b/README.md
@@ -10,13 +10,13 @@ Flarum is the next-generation forum software that makes online discussion fun. I
 
 - Lightweight & secure image
 - Based on Alpine Linux with **nginx** and **PHP 7**
-- Latest Flarum Beta (v0.1.0-beta.6)
+- Latest Flarum Beta (v0.1.0-beta.7)
 - MySQL/Mariadb driver
 - OPCache extension configured
 
 ### Build-time variables
 
-- **VERSION** = Version of flarum (default: *v0.1.0-beta.6*)
+- **VERSION** = Version of flarum (default: *v0.1.0-beta.7*)
 
 ### Ports
 
@@ -49,7 +49,7 @@ Flarum is the next-generation forum software that makes online discussion fun. I
 
 ```
 # Pull from hub.docker.com :
-docker pull mondedie/docker-flarum:0.1.0-beta.6-stable
+docker pull mondedie/docker-flarum:0.1.0-beta.7-stable
 
 # or build it manually :
 docker build -t mondedie/docker-flarum https://github.com/mondediefr/flarum.git#master
@@ -61,7 +61,7 @@ Adapt to your needs :
 
 ```
 flarum:
-  image: mondedie/docker-flarum:0.1.0-beta.6-stable
+  image: mondedie/docker-flarum:0.1.0-beta.7-stable
   container_name: flarum
   links:
     - mariadb:mariadb
@@ -96,12 +96,12 @@ You can now run Flarum :
 docker-compose up -d
 ```
 
-### Upgrade from beta 5
+### Upgrade from v0.1.0-beta.6
 
 :warning: Disable 3rd party extensions prior to upgrading.
 
 ```
-docker pull mondedie/docker-flarum && docker-compose up -d
+docker pull mondedie/docker-flarum:0.1.0-beta.7-stable && docker-compose up -d
 ```
 
 Navigate to `yourforum.com/admin`, enter your database password and update.