Merge pull request #90 from jkaninda/dev

Upgrade images to PHP 8.5 and fix php-fpm not starting as root

build.sh

@@ -1,17 +1,17 @@
 #!/bin/bash
-if [ $# -eq 0 ]
-  then
-    tag='latest'
-  else
-    tag=$1
-fi
-if [ $tag != 'latest' ]
-then
-  echo 'Build from from tag'
-  docker build -f src/docker/${tag}/Dockerfile -t jkaninda/laravel-php-fpm:$tag .
-else
- echo 'Build latest'
- docker build -f src/docker/8.3/Dockerfile -t jkaninda/laravel-php-fpm:$tag .
- 
-fi
+# Usage: ./build.sh [php-version] (default: 8.5)
+#        ./build.sh 8.4-alpine
+set -e
+tag=${1:-8.5}
+version=${tag%-alpine}
 
+if [ -f "src/docker/${version}/Dockerfile" ]; then
+  echo "Build legacy image ${tag}"
+  docker build -f "src/docker/${version}/Dockerfile" -t "jkaninda/laravel-php-fpm:${tag}" .
+elif [ "${tag}" != "${version}" ]; then
+  echo "Build ${tag}"
+  docker build --build-arg phpVersion="${version}" -f src/docker/Dockerfile.alpine -t "jkaninda/laravel-php-fpm:${tag}" .
+else
+  echo "Build ${tag}"
+  docker build --build-arg phpVersion="${version}" -f src/docker/Dockerfile -t "jkaninda/laravel-php-fpm:${tag}" .
+fi