Merge branch 'master' into patch-2
commit
d82ee1576f
|
@ -54,7 +54,7 @@ RUN apk add --no-progress --no-cache \
|
||||||
s6 \
|
s6 \
|
||||||
&& cd /tmp \
|
&& cd /tmp \
|
||||||
&& ln -s /usr/bin/php8 /usr/bin/php \
|
&& ln -s /usr/bin/php8 /usr/bin/php \
|
||||||
&& curl -s http://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
|
&& curl --progress-bar http://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
|
||||||
&& curl -L --progress-bar https://github.com/xxxxxliil/db-live-test/releases/download/0.0.1/db-live-test.php -o /usr/local/bin/db-live-test \
|
&& curl -L --progress-bar https://github.com/xxxxxliil/db-live-test/releases/download/0.0.1/db-live-test.php -o /usr/local/bin/db-live-test \
|
||||||
&& sed -i 's/memory_limit = .*/memory_limit = ${PHP_MEMORY_LIMIT}/' /etc/php8/php.ini \
|
&& sed -i 's/memory_limit = .*/memory_limit = ${PHP_MEMORY_LIMIT}/' /etc/php8/php.ini \
|
||||||
&& chmod +x /usr/local/bin/composer \
|
&& chmod +x /usr/local/bin/composer \
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
- **latest** [(Dockerfile)](https://github.com/mondediefr/docker-flarum/blob/master/Dockerfile)
|
- **latest** [(Dockerfile)](https://github.com/mondediefr/docker-flarum/blob/master/Dockerfile)
|
||||||
- **stable** [(Dockerfile)](https://github.com/mondediefr/docker-flarum/blob/master/Dockerfile)
|
- **stable** [(Dockerfile)](https://github.com/mondediefr/docker-flarum/blob/master/Dockerfile)
|
||||||
- **1.0.0** [(Dockerfile)](https://github.com/mondediefr/docker-flarum/blob/1.0.0/Dockerfile)
|
- **1.0.2** [(Dockerfile)](https://github.com/mondediefr/docker-flarum/blob/1.0.2/Dockerfile)
|
||||||
- **0.1.0-beta.16** [(Dockerfile)](https://github.com/mondediefr/docker-flarum/blob/0.1.0-beta.16/Dockerfile)
|
- **0.1.0-beta.16** [(Dockerfile)](https://github.com/mondediefr/docker-flarum/blob/0.1.0-beta.16/Dockerfile)
|
||||||
- **0.1.0-beta.15** [(Dockerfile)](https://github.com/mondediefr/docker-flarum/blob/0.1.0-beta.15/Dockerfile)
|
- **0.1.0-beta.15** [(Dockerfile)](https://github.com/mondediefr/docker-flarum/blob/0.1.0-beta.15/Dockerfile)
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@
|
||||||
- Lightweight & secure image
|
- Lightweight & secure image
|
||||||
- Based on Alpine Linux 3.13
|
- Based on Alpine Linux 3.13
|
||||||
- **nginx** and **PHP 8.0**
|
- **nginx** and **PHP 8.0**
|
||||||
- Latest [Flarum Core](https://github.com/flarum/core) (v1.0.0)
|
- Latest [Flarum Core](https://github.com/flarum/core) (v1.0.2)
|
||||||
- MySQL/Mariadb driver
|
- MySQL/Mariadb driver
|
||||||
- OPCache extension configured
|
- OPCache extension configured
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Guide for upgrade your flarum container
|
# Guide for upgrade your flarum container
|
||||||
|
|
||||||
### Upgrade to v0.1.0-beta.16 from v0.1.0
|
### Upgrade to v1.0.2 from v0.1.0-beta.16
|
||||||
|
|
||||||
:warning: Backup your database, config.php, composer.lock and assets folder
|
:warning: Backup your database, config.php, composer.lock and assets folder
|
||||||
:warning: Disable all 3rd party extensions prior to upgrading in panel admin.
|
:warning: Disable all 3rd party extensions prior to upgrading in panel admin.
|
||||||
|
@ -12,14 +12,14 @@ version: "3"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
flarum:
|
flarum:
|
||||||
image: mondedie/flarum:1.0.0
|
image: mondedie/flarum:1.0.2
|
||||||
...
|
...
|
||||||
```
|
```
|
||||||
|
|
||||||
2 - Pull the last docker images
|
2 - Pull the last docker images
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
docker pull mondedie/flarum:1.0.0
|
docker pull mondedie/flarum:1.0.2
|
||||||
docker-compose stop flarum
|
docker-compose stop flarum
|
||||||
docker-compose rm flarum
|
docker-compose rm flarum
|
||||||
docker-compose up -d flarum
|
docker-compose up -d flarum
|
||||||
|
|
|
@ -106,7 +106,7 @@ if [ -e '/flarum/app/public/assets/rev-manifest.json' ] || [ -e '/flarum/app/pub
|
||||||
while read line; do
|
while read line; do
|
||||||
extension="${extension}${line} "
|
extension="${extension}${line} "
|
||||||
done < /flarum/app/extensions/list
|
done < /flarum/app/extensions/list
|
||||||
cmd="composer require --update-with-all-dependencies ${extension}"
|
cmd="composer require ${extension}"
|
||||||
eval "COMPOSER_CACHE_DIR=${CACHE_DIR} su-exec ${UID}:${GID} ${cmd}"
|
eval "COMPOSER_CACHE_DIR=${CACHE_DIR} su-exec ${UID}:${GID} ${cmd}"
|
||||||
echo "[INFO] Install extra bundled extensions: DONE"
|
echo "[INFO] Install extra bundled extensions: DONE"
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue