- Added fallback for cases when buildx docker plugin is not installed

- Removed intermediate dump-autoload as it probably takes more time than benifits for the following build

bin/sdk/images/common.sh

@@ -18,13 +18,29 @@ function Images::destroy() {
     docker rmi -f "${SPRYKER_PLATFORM_IMAGE}" 2>/dev/null || true
 }
 
+function Images::_checkBuildxVersion() {
+    min_version=${1}
+    version_regex="v([0-9]+\.[0-9]+\.[0-9]+)"
+    actual_version=$([[ $(docker buildx version) =~ $version_regex ]] && echo "${BASH_REMATCH[1]}")
+    greater_version=$(printf "%s\n%s\n" "${actual_version}" "${min_version}" | sort -t '.' -k 1,1 -k 2,2 -k 3,3 -g | tail -n 1)
+    if [ "$min_version" == "$greater_version" ]; then
+        return "${FALSE}"
+    fi
+}
+
 function Images::_build() {
 
-    # Checking availability of docker bake
-    if docker buildx --help | grep bake >/dev/null 2>&1; then
-        import sdk/images/engine/bake.sh
+    # Checking availability of docker bake or buildx
+    if docker buildx >/dev/null 2>&1; then
+        if Images::_checkBuildxVersion "0.8.99"; then
+            import sdk/images/engine/bake.sh
+        else
+            import sdk/images/engine/buildx.sh
+            Console::warn 'Warning! Upgrade `buildx` docker plugin to the latest version for better performance'
+        fi
     else
         import sdk/images/engine/build.sh
+        Console::warn 'Warning! Install `buildx` docker plugin for better performance'
     fi
 
     # Using temporary file for secrets as `docker secret` is only available for swarm mode.

bin/sdk/images/engine/build.common.sh

@@ -0,0 +1,91 @@
+#!/bin/bash
+
+require docker
+
+function Images::_build::perform() {
+
+    local folder=${1}
+    local TARGET_TAG=${2:-${SPRYKER_DOCKER_TAG}}
+    local destination=${3:-print}
+
+    local targetImage="${SPRYKER_DOCKER_PREFIX}_target:${SPRYKER_DOCKER_TAG}"
+
+    Console::verbose "${INFO}Building images${NC}"
+
+    # Primal build including all stages to fully benefit from multistage features
+    Images::build::_runBuild --target "target" -t "${targetImage}"
+
+    # Tagging all the images by running the same build targeting different stages
+    source ${DEPLOYMENT_PATH}/images/${folder}/${destination}.sh
+
+    local -a arguments=('--quiet' '--progress' 'auto')
+
+    if [ -n "${SSH_AUTH_SOCK_IN_CLI}" ]; then
+        arguments+=('--ssh' 'default')
+    fi
+
+    if Images::needPush; then
+        Console::verbose "${INFO}Tagging and pushing images${NC}"
+    else
+        Console::verbose "${INFO}Tagging images${NC}"
+    fi
+
+    arguments+=($(Images::_build::prepareArguments))
+
+    local -a pids
+    local targetData
+    for targetData in "${TARGET_TAGS[@]}"; do
+        eval "${targetData}"
+
+        local -a tagArguments=()
+        local tag
+        for tag in "${TAGS[@]}"; do
+            tagArguments+=('-t' "${tag}")
+        done
+
+        Console::info "${YELLOW}Target:${NC} ${TARGET}"
+        Console::verbose "${YELLOW}Tags:${NC}"
+        Console::verbose "${DGRAY}${TAGS[@]}${NC}"
+        Console::verbose "${YELLOW}Hash:${NC}"
+        Images::build::_runBuild --target "${TARGET}" "${arguments[@]}" "${tagArguments[@]}"
+
+        Images::_build::afterTaggingAnImage "${TAGS[@]}" &
+        pids+=($!)
+    done
+
+    docker rmi -f "${targetImage}" >/dev/null 2>&1 || true
+
+    local pid
+    for pid in "$pids[@]"; do
+        wait $pid || exit 1
+    done
+}
+
+function Images::build::_runBuild {
+
+    docker build \
+        -f "${DEPLOYMENT_PATH}/images/${folder}/Dockerfile" \
+        "${@}" \
+        --secret "id=secrets-env,src=$SECRETS_FILE_PATH" \
+        --label "spryker.project=${SPRYKER_DOCKER_PREFIX}" \
+        --label "spryker.revision=${SPRYKER_BUILD_HASH}" \
+        --label "spryker.sdk.revision=${SPRYKER_SDK_REVISION}" \
+        --build-arg "DEPLOYMENT_PATH=${DEPLOYMENT_PATH}" \
+        --build-arg "SPRYKER_PLATFORM_IMAGE=${SPRYKER_PLATFORM_IMAGE}" \
+        --build-arg "SPRYKER_FRONTEND_IMAGE=${SPRYKER_FRONTEND_IMAGE}" \
+        --build-arg "SPRYKER_LOG_DIRECTORY=${SPRYKER_LOG_DIRECTORY}" \
+        --build-arg "SPRYKER_PIPELINE=${SPRYKER_PIPELINE}" \
+        --build-arg "APPLICATION_ENV=${APPLICATION_ENV}" \
+        --build-arg "SPRYKER_COMPOSER_MODE=${SPRYKER_COMPOSER_MODE}" \
+        --build-arg "SPRYKER_COMPOSER_AUTOLOAD=${SPRYKER_COMPOSER_AUTOLOAD}" \
+        --build-arg "SPRYKER_ASSETS_MODE=${SPRYKER_ASSETS_MODE}" \
+        --build-arg "SPRYKER_DB_ENGINE=${SPRYKER_DB_ENGINE}" \
+        --build-arg "KNOWN_HOSTS=${KNOWN_HOSTS}" \
+        --build-arg "SPRYKER_BUILD_HASH=${SPRYKER_BUILD_HASH}" \
+        --build-arg "SPRYKER_BUILD_STAMP=${SPRYKER_BUILD_STAMP}" \
+        --build-arg "SPRYKER_NODE_IMAGE_VERSION=${SPRYKER_NODE_IMAGE_VERSION}" \
+        --build-arg "SPRYKER_NODE_IMAGE_DISTRO=${SPRYKER_NODE_IMAGE_DISTRO}" \
+        --build-arg "SPRYKER_NPM_VERSION=${SPRYKER_NPM_VERSION}" \
+        --build-arg "USER_UID=${USER_UID}" \
+        ./ >&2
+}

bin/sdk/images/engine/build.sh

@@ -1,82 +1,19 @@
 #!/bin/bash
 
-require docker
+import sdk/images/engine/build.common.sh
 
-function Images::_build::perform() {
-
-    local folder=${1}
-    local TARGET_TAG=${2:-${SPRYKER_DOCKER_TAG}}
-    local destination=${3:-print}
-
-    local targetImage="${SPRYKER_DOCKER_PREFIX}_target:${SPRYKER_DOCKER_TAG}"
-
-    Console::verbose "${INFO}Building images${NC}"
-
-    # Primal build including all stages to fully benefit from multistage features
-    Images::build::_runBuild --target "target" -t "${targetImage}"
-
-    # Tagging all the images by running the same build targeting different stages
-    source ${DEPLOYMENT_PATH}/images/${folder}/${destination}.sh
-
-    local -a arguments=('--quiet' '--progress' 'auto')
+function Images::_build::prepareArguments() {
+    :
+}
 
-    if [ -n "${SSH_AUTH_SOCK_IN_CLI}" ]; then
-        arguments+=('--ssh' 'default')
-    fi
+function Images::_build::afterTaggingAnImage() {
+set -x
+    local -a tagsToPush=("${@}")
 
     if Images::needPush; then
-        arguments+=('--push')
-        Console::verbose "${INFO}Tagging and pushing images${NC}"
-    else
-        Console::verbose "${INFO}Tagging images${NC}"
-    fi
-
-    local targetData
-    for targetData in "${TARGET_TAGS[@]}"; do
-        eval "${targetData}"
-
-        local -a tagArguments=()
         local tag
-        for tag in "${TAGS[@]}"; do
-            tagArguments+=('-t' "${tag}")
+        for tag in "${tagsToPush[@]}"; do
+            docker push ${tag}
         done
-
-        Console::info "${YELLOW}Target:${NC} ${TARGET}"
-        Console::verbose "${YELLOW}Tags:${NC}"
-        Console::verbose "${DGRAY}${TAGS[@]}${NC}"
-        Console::verbose "${YELLOW}Hash:${NC}"
-        Images::build::_runBuild --target "${TARGET}" "${arguments[@]}" "${tagArguments[@]}"
-
-    done
-
-    docker rmi -f "${targetImage}" >/dev/null 2>&1 || true
-}
-
-function Images::build::_runBuild {
-
-    docker build \
-        -f "${DEPLOYMENT_PATH}/images/${folder}/Dockerfile" \
-        "${@}" \
-        --secret "id=secrets-env,src=$SECRETS_FILE_PATH" \
-        --label "spryker.project=${SPRYKER_DOCKER_PREFIX}" \
-        --label "spryker.revision=${SPRYKER_BUILD_HASH}" \
-        --label "spryker.sdk.revision=${SPRYKER_SDK_REVISION}" \
-        --build-arg "DEPLOYMENT_PATH=${DEPLOYMENT_PATH}" \
-        --build-arg "SPRYKER_PLATFORM_IMAGE=${SPRYKER_PLATFORM_IMAGE}" \
-        --build-arg "SPRYKER_FRONTEND_IMAGE=${SPRYKER_FRONTEND_IMAGE}" \
-        --build-arg "SPRYKER_LOG_DIRECTORY=${SPRYKER_LOG_DIRECTORY}" \
-        --build-arg "SPRYKER_PIPELINE=${SPRYKER_PIPELINE}" \
-        --build-arg "APPLICATION_ENV=${APPLICATION_ENV}" \
-        --build-arg "SPRYKER_COMPOSER_MODE=${SPRYKER_COMPOSER_MODE}" \
-        --build-arg "SPRYKER_COMPOSER_AUTOLOAD=${SPRYKER_COMPOSER_AUTOLOAD}" \
-        --build-arg "SPRYKER_ASSETS_MODE=${SPRYKER_ASSETS_MODE}" \
-        --build-arg "SPRYKER_DB_ENGINE=${SPRYKER_DB_ENGINE}" \
-        --build-arg "KNOWN_HOSTS=${KNOWN_HOSTS}" \
-        --build-arg "SPRYKER_BUILD_HASH=${SPRYKER_BUILD_HASH}" \
-        --build-arg "SPRYKER_BUILD_STAMP=${SPRYKER_BUILD_STAMP}" \
-        --build-arg "SPRYKER_NODE_IMAGE_VERSION=${SPRYKER_NODE_IMAGE_VERSION}" \
-        --build-arg "SPRYKER_NODE_IMAGE_DISTRO=${SPRYKER_NODE_IMAGE_DISTRO}" \
-        --build-arg "SPRYKER_NPM_VERSION=${SPRYKER_NPM_VERSION}" \
-        --build-arg "USER_UID=${USER_UID}" \
-        ./ >&2
+    fi
 }

bin/sdk/images/engine/buildx.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+import sdk/images/engine/build.common.sh
+
+function Images::_build::prepareArguments() {
+    if Images::needPush; then
+        echo '--push'
+    fi
+}
+
+function Images::_build::afterTaggingAnImage() {
+    :
+}

images/templates/baked/application.Dockerfile

@@ -29,8 +29,6 @@ LABEL "spryker.image" "none"
 
 USER spryker
 
-RUN composer dump-autoload -o
-
 ARG SPRYKER_PIPELINE
 ENV SPRYKER_PIPELINE=${SPRYKER_PIPELINE}
 ARG SPRYKER_DB_ENGINE