From c3c56ba799caf86c24748c532f3245ac1eaa2d9b Mon Sep 17 00:00:00 2001 From: Magicalex Date: Thu, 27 Jan 2022 21:54:55 +0100 Subject: [PATCH] update(): flarum version 1.2.0 --- Dockerfile | 4 +- LICENSE | 2 +- README.md | 8 ++-- UPGRADE.md | 69 +++++++++++++++-------------- rootfs/flarum/app/config.php.sample | 1 + rootfs/flarum/app/config.yml | 1 - 6 files changed, 43 insertions(+), 42 deletions(-) diff --git a/Dockerfile b/Dockerfile index 81bf77c..30ed5a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -FROM alpine:3.13 +FROM alpine:3.15 LABEL description="Simple forum software for building great communities" \ maintainer="Magicalex , Hardware " -ARG VERSION=v1.0.0 +ARG VERSION=v1.2.0 ENV GID=991 \ UID=991 \ diff --git a/LICENSE b/LICENSE index 3822550..cdd1999 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2021 mondedie/flarum +Copyright (c) 2022 mondedie/flarum Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index c0ac22e..ebdc2b6 100644 --- a/README.md +++ b/README.md @@ -11,21 +11,21 @@ - **latest** [(Dockerfile)](https://github.com/mondediefr/docker-flarum/blob/master/Dockerfile) - **stable** [(Dockerfile)](https://github.com/mondediefr/docker-flarum/blob/master/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) + - **1.2.0** [(Dockerfile)](https://github.com/mondediefr/docker-flarum/blob/1.2.0/Dockerfile) ### Features - Multi-platform image: `linux/386`, `linux/amd64`, `linux/arm/v6`, `linux/arm/v7`, `linux/arm64` - Lightweight & secure image -- Based on Alpine Linux 3.13 +- Based on Alpine Linux 3.15 - **nginx** and **PHP 8.0** -- Latest [Flarum Core](https://github.com/flarum/core) (v1.0.2) +- Latest [Flarum Core](https://github.com/flarum/core) (v1.2.0) - MySQL/Mariadb driver - OPCache extension configured ### Build-time variables -- **VERSION** = Version of [flarum/flarum](https://github.com/flarum/flarum) skeleton (default: *v1.0.0*) +- **VERSION** = Version of [flarum/flarum](https://github.com/flarum/flarum) skeleton (default: *v1.2.0*) ### Ports diff --git a/UPGRADE.md b/UPGRADE.md index 1b497b9..b7e7572 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -1,5 +1,40 @@ # Guide for upgrade your flarum container +### Upgrade to v1.2.0 from v1.0.2 + +:warning: Backup your database, config.php, composer.lock and assets folder +:warning: Disable all 3rd party extensions prior to upgrading in panel admin. + +1 - Update your docker-compose file, see an example [here](https://github.com/mondediefr/docker-flarum/tree/master#2---docker-composeyml) + +```yml +version: "3" + +services: + flarum: + image: mondedie/flarum:1.2.0 + ... +``` + +2 - Pull the last docker images + +```sh +docker pull mondedie/flarum:1.2.0 +docker-compose stop flarum +docker-compose rm flarum +docker-compose up -d flarum +``` + +3 - Updating your database and removing old assets & extensions + +```sh +docker exec -ti flarum php /flarum/app/flarum migrate +docker exec -ti flarum php /flarum/app/flarum cache:clear +``` + +After that your upgrade is finish. :tada: :tada: + + ### Upgrade to v1.0.2 from v0.1.0-beta.16 :warning: Backup your database, config.php, composer.lock and assets folder @@ -33,37 +68,3 @@ docker exec -ti flarum php /flarum/app/flarum cache:clear ``` After that your upgrade is finish. :tada: :tada: - -### Upgrade to v0.1.0-beta.16 from v0.1.0-beta.15 - -:warning: Backup your database, config.php, composer.lock and assets folder -:warning: Disable all 3rd party extensions prior to upgrading in panel admin. - -1 - Update your docker-compose file, see an example [here](https://github.com/mondediefr/docker-flarum/tree/master#2---docker-composeyml) - -```yml -version: "3" - -services: - flarum: - image: mondedie/flarum:0.1.0-beta.16 - ... -``` - -2 - Pull the last docker images - -```sh -docker pull mondedie/flarum:0.1.0-beta.16 -docker-compose stop flarum -docker-compose rm flarum -docker-compose up -d flarum -``` - -3 - Updating your database and removing old assets & extensions - -```sh -docker exec -ti flarum php /flarum/app/flarum migrate -docker exec -ti flarum php /flarum/app/flarum cache:clear -``` - -After that your upgrade is finish. :tada: :tada: diff --git a/rootfs/flarum/app/config.php.sample b/rootfs/flarum/app/config.php.sample index 0a93afa..925f43b 100644 --- a/rootfs/flarum/app/config.php.sample +++ b/rootfs/flarum/app/config.php.sample @@ -1,5 +1,6 @@ , + 'offline' => false, 'database' => array ( 'driver' => 'mysql', 'host' => '', diff --git a/rootfs/flarum/app/config.yml b/rootfs/flarum/app/config.yml index 35cc590..639f4b1 100644 --- a/rootfs/flarum/app/config.yml +++ b/rootfs/flarum/app/config.yml @@ -11,7 +11,6 @@ databaseConfiguration: adminUser: username: password: - password_confirmation: email: settings: forum_title: