Update images and chmod +x hook scripts in repo

images/10.0/php7.3-apache-i386/Dockerfile → images/10.0/php7.3-apache/Dockerfile

@@ -1,4 +1,4 @@
-FROM i386/php:7.3-apache
+FROM php:7.3-apache
 
 # Install the packages we need
 # Install the PHP extensions we need

images/11.0/php7.3-apache-amd64/docker-compose.test.yml → images/10.0/php7.3-apache/docker-compose.test.yml

@@ -35,7 +35,6 @@ services:
       context: ./
       dockerfile: Dockerfile
       args: 
-        - TAG=${TAG}
         - VCS_REF=${VCS_REF}
         - BUILD_DATE=${BUILD_DATE}
     image: ${IMAGE_NAME}

images/10.0/php7.3-fpm-alpine-amd64/hooks/build → images/10.0/php7.3-apache/hooks/build

@@ -4,9 +4,9 @@
 # https://docs.docker.com/docker-hub/builds/advanced/
 # https://microbadger.com/labels
 
-docker build \
-    --build-arg "TAG=${DOCKER_TAG}" \
+docker buildx build \
     --build-arg "VCS_REF=$(git rev-parse --short HEAD)" \
     --build-arg "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \
+    --load \
     -f "$DOCKERFILE_PATH" \
     -t "$IMAGE_NAME" .

images/10.0/php7.3-fpm-alpine-amd64/hooks/post_push → images/10.0/php7.3-apache/hooks/post_push

@@ -6,8 +6,13 @@
 if [ -f ./.dockertags ]; then
     for tag in $(cat ./.dockertags); do
         if [ ! "${tag}" = "${DOCKER_TAG}" ]; then
-            docker tag "$IMAGE_NAME" "$DOCKER_REPO:$tag"
-            docker push "$DOCKER_REPO:$tag"
+            docker buildx build \
+            --build-arg "VCS_REF=$(git rev-parse --short HEAD)" \
+            --build-arg "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \
+            --platform "$DOCKER_PLATFORM" \
+            --push \
+            -f "$DOCKERFILE_PATH" \
+            -t "$DOCKER_REPO:$tag" .
         fi
     done
 fi

images/10.0/php7.3-apache-amd64/hooks/pre_push → images/10.0/php7.3-apache/hooks/pre_push

@@ -4,5 +4,5 @@
 # https://docs.docker.com/docker-hub/builds/advanced/
 
 if [ -n "${DOCKER_PASSWORD}" ] && [ -n "${DOCKER_REGISTRY}" ]; then
-    docker login -u "${DOCKER_LOGIN}" -p "${DOCKER_PASSWORD}" "${DOCKER_REGISTRY}"
+    echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_LOGIN}" --password-stdin "${DOCKER_REGISTRY}"
 fi

images/10.0/php7.3-fpm-alpine-amd64/hooks/pre_test → images/10.0/php7.3-apache/hooks/pre_test

@@ -10,6 +10,9 @@ if [ ! -f '.env' ]; then
     mv .env.tmp .env
 fi
 
+export VCS_REF=$(git rev-parse --short HEAD)
+export BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
+
 #echo 'Preparing persisted data...'
 #mkdir -p "${APP_HOME:-/srv/dolibarr}"
 #chown 777 "${APP_HOME:-/srv/dolibarr}"

images/10.0/php7.3-fpm-alpine-i386/hooks/run → images/10.0/php7.3-apache/hooks/run_push

@@ -16,11 +16,11 @@ COMMIT_MSG=$(git log -1 --format=%s)
 
 export DOCKER_REPO=monogramm/docker-dolibarr
 export DOCKERFILE_PATH=Dockerfile
-export DOCKER_TAG=10.0
+export DOCKER_TAG=${VARIANT}
 export IMAGE_NAME=${DOCKER_REPO}:${DOCKER_TAG}
 
 # Execute hooks in given order
-IFS=',' read -ra STEPS <<< "${1:-build,test}"
+IFS=',' read -ra STEPS <<< "${1:-push}"
 for step in "${STEPS[@]}"
 do
     for hook in "pre_${step}" "${step}" "post_${step}"; do

images/10.0/php7.3-fpm-alpine-i386/Dockerfile → images/10.0/php7.3-fpm-alpine/Dockerfile

@@ -1,4 +1,4 @@
-FROM i386/php:7.3-fpm-alpine
+FROM php:7.3-fpm-alpine
 
 # Install the packages we need
 # Install the PHP extensions we need