From 74589ee3ec5d1f3255e8e56b04aa9d702cd7ed74 Mon Sep 17 00:00:00 2001 From: Magicalex Date: Tue, 1 Jun 2021 00:13:52 +0200 Subject: [PATCH 1/4] feat(): improve curl option close #89 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f150d47..81bf77c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,7 +53,7 @@ RUN apk add --no-progress --no-cache \ s6 \ && cd /tmp \ && 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 \ && sed -i 's/memory_limit = .*/memory_limit = ${PHP_MEMORY_LIMIT}/' /etc/php8/php.ini \ && chmod +x /usr/local/bin/composer \ && mkdir -p /run/php /flarum/app \ From 17fa6794de25a171a1bf780fa4f1263d38927789 Mon Sep 17 00:00:00 2001 From: Magicalex Date: Tue, 1 Jun 2021 21:34:37 +0200 Subject: [PATCH 2/4] fix(): remove option --- rootfs/usr/local/bin/startup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs/usr/local/bin/startup b/rootfs/usr/local/bin/startup index 7cffaab..b8ee399 100644 --- a/rootfs/usr/local/bin/startup +++ b/rootfs/usr/local/bin/startup @@ -87,7 +87,7 @@ if [ -e '/flarum/app/public/assets/rev-manifest.json' ] || [ -e '/flarum/app/pub while read line; do extension="${extension}${line} " 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}" echo "[INFO] Install extra bundled extensions: DONE" else From 4ba45e027645629eb4605451278b9e75289ad071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A1=8C=E6=97=85=E9=80=94?= Date: Sat, 5 Jun 2021 05:28:33 +0800 Subject: [PATCH 3/4] chore: version to 1.0.1 (#96) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 81bf77c..d5be84c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.13 LABEL description="Simple forum software for building great communities" \ maintainer="Magicalex , Hardware " -ARG VERSION=v1.0.0 +ARG VERSION=v1.0.1 ENV GID=991 \ UID=991 \ From c67f08799a8dace45cb32a9102679378e3802fa1 Mon Sep 17 00:00:00 2001 From: Magicalex Date: Mon, 7 Jun 2021 04:30:53 +0200 Subject: [PATCH 4/4] fix(): flarum version --- Dockerfile | 2 +- README.md | 4 ++-- UPGRADE.md | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index d5be84c..81bf77c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.13 LABEL description="Simple forum software for building great communities" \ maintainer="Magicalex , Hardware " -ARG VERSION=v1.0.1 +ARG VERSION=v1.0.0 ENV GID=991 \ UID=991 \ diff --git a/README.md b/README.md index bebd284..4099d57 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ - **latest** [(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.15** [(Dockerfile)](https://github.com/mondediefr/docker-flarum/blob/0.1.0-beta.15/Dockerfile) @@ -20,7 +20,7 @@ - Lightweight & secure image - Based on Alpine Linux 3.13 - **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 - OPCache extension configured diff --git a/UPGRADE.md b/UPGRADE.md index 5dadaed..bbdfc2e 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -1,6 +1,6 @@ # 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: Disable all 3rd party extensions prior to upgrading in panel admin. @@ -12,14 +12,14 @@ version: "3" services: flarum: - image: mondedie/flarum:1.0.0 + image: mondedie/flarum:1.0.2 ... ``` 2 - Pull the last docker images ```sh -docker pull mondedie/flarum:1.0.0 +docker pull mondedie/flarum:1.0.2 docker-compose stop flarum docker-compose rm flarum docker-compose up -d flarum