From 767bed3097fc36d40e904fc8258f10b4b8334d91 Mon Sep 17 00:00:00 2001 From: bkraul Date: Mon, 3 Jun 2024 12:31:34 +0000 Subject: [PATCH] Minor corrections --- README.md | 27 +++++++++++++++++++-------- build | 4 ++-- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 72d0995..e6d7bd5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![Nextcloud](https://raw.githubusercontent.com/docker-library/docs/e563b6cd3d797e2b3695576d20041227d1fb7536/nextcloud/logo.svg?sanitize=true "Nextcloud") -**NOTE:** There is no longer a `latest` or `fpm-alpine` tag, as the latest version from nextcloud would be `21` but at the moment, I consider `20` more stable, you will now have to specify which major version you need: `16-fpm-alpine`,`16-fpm`,`17-fpm-alpine`,`17-fpm`,`18-fpm-alpine`,`18-fpm`,`19-fpm-alpine`,`19-fpm`,`20-fpm-alpine`,`20-fpm`,`21-fpm-alpine`,`21-fpm`. This should prevent major problems with an unintended upgrade from one major version to another (you cannot easily downgrade). +**NOTE:** There is no longer a `latest` or `fpm-alpine` tag, as the latest version from nextcloud would be `29` but at the moment, I consider `28` more stable, you will now have to specify which major version you need: `27-fpm-alpine`,`27-fpm`,`28-fpm-alpine`,`28-fpm`,`29-fpm-alpine`,`29-fpm`. This should prevent major problems with an unintended upgrade from one major version to another (you cannot easily downgrade). In the fpm tag, the `www-data` user has been modified to uid/gid 82, to coincide with the alpine version, and also work with the companion nginx container, [`bkraul/nginx-nextcloud`](https://hub.docker.com/repository/docker/bkraul/nginx-nextcloud). @@ -9,16 +9,27 @@ This image is fully based on the latest official [fpm-alpine/fpm Nextcloud](http # Features This image adds built-in support for the following features: +* bz2 (versions 28+) * Samba * Redis -* ImageMagick: (The latest `fpm-alpine` image for version 16 does not support any image formats (including the needed SVG format), due to it missing `imagemagick` package). This image corrects that. +* ImageMagick: (The `fpm-alpine` image does not natively support any image formats (including the needed SVG format), due to it missing `imagemagick` package). This image corrects that. # Current Versions -The current `21-fpm-alpine` and `21-fpm` version is: **21.0.0**\ -The current `20-fpm-alpine` and `20-fpm` version is: **20.0.8**\ -The current `19-fpm-alpine` and `19-fpm` version is: **19.0.9**\ -The last`18-fpm-alpine` and `18-fpm` version is: **18.0.14** (No longer officially supported/updated by Nextcloud)\ -The last`17-fpm-alpine` and `17-fpm` version is: **17.0.10** (No longer officially supported/updated by Nextcloud)\ +The current `28-fpm-alpine` and `28-fpm` version is **29.0.1**\ +The current `28-fpm-alpine` and `28-fpm` version is **28.0.6**\ +The current `27-fpm-alpine` and `27-fpm` version is **27.1.10** + +# Deprecated Versions +The last `26-fpm-alpine` and `26-fpm` version is **26.0.10** (No longer officially supported/updated by Nextcloud)\ +The last `25-fpm-alpine` and `25-fpm` version is: **25.0.13** (No longer officially supported/updated by Nextcloud)\ +The last `24-fpm-alpine` and `24-fpm` version is: **24.0.12** (No longer officially supported/updated by Nextcloud)\ +The last `23-fpm-alpine` and `23-fpm` version is: **23.0.12** (No longer officially supported/updated by Nextcloud)\ +The last `22-fpm-alpine` and `22-fpm` version is: **22.2.10** (No longer officially supported/updated by Nextcloud)\ +The last `21-fpm-alpine` and `21-fpm` version is: **21.0.9** (No longer officially supported/updated by Nextcloud)\ +The last `20-fpm-alpine` and `20-fpm` version is: **20.0.10** (No longer officially supported/updated by Nextcloud)\ +The last `19-fpm-alpine` and `19-fpm` version is: **19.0.12** (No longer officially supported/updated by Nextcloud)\ +The last `18-fpm-alpine` and `18-fpm` version is: **18.0.14** (No longer officially supported/updated by Nextcloud)\ +The last `17-fpm-alpine` and `17-fpm` version is: **17.0.10** (No longer officially supported/updated by Nextcloud)\ The last `16-fpm-alpine` and `16-fpm` version is: **16.0.11** (No longer officially supported/updated by Nextcloud) @@ -26,4 +37,4 @@ The last `16-fpm-alpine` and `16-fpm` version is: **16.0.11** (No longer officia https://git.belmankraul.com/docker/nextcloud # Issues -For issues or questions, visit https://discourse.belmankraul.com/c/docker/nextcloud +For issues or questions, visit https://discourse.belmankraul.com/c/docker/nextcloud \ No newline at end of file diff --git a/build b/build index 7b60b34..a3d1e12 100755 --- a/build +++ b/build @@ -2,6 +2,7 @@ # use this as: PUSH=0 ./build ... in order to set the variable. default is PUSH=1 PUSH=${PUSH:-1} +# use this as: FORCE=1 ./build ... in order to set the variable. default is FORCE=0 FORCE=${FORCE:-0} if [ ! "$1" == "" ]; then @@ -49,7 +50,6 @@ do # nothing to do, the image already exists. echo Image ${IMAGE}:${IMAGE_TAG} already exists. echo "----------------------------" - echo "FORCE: $FORCE" if [ $FORCE == 0 ]; then continue; fi fi @@ -68,7 +68,7 @@ do # image doesn't exist we need build and push echo Image ${IMAGE}:${IMAGE_TAG} does not exist. echo "Building image(s)..." - #--file ${DOCKERFILE} \ + docker build \ --file ${DOCKERFILE} \ --no-cache \