SC-XXX: Improved speed of docker image building

.dockerignore.default

@@ -1,4 +1,5 @@
 .git*
+**/.git
 .idea
 .DS_Store
 node_modules

bin/command/build/baked/build.sh

@@ -13,18 +13,15 @@ function Command::build() {
     subCommand=${1}
     case ${subCommand} in
         images | image)
-            Images::buildApplication --force
-            Assets::build
-            Images::buildFrontend --force
+            Images::build --force
             ;;
         assets | asset)
+            Images::build --force
             Assets::build --force
-            Images::buildFrontend --force
             ;;
         '')
-            Images::buildApplication --force
+            Images::build --force
             Assets::build --force
-            Images::buildFrontend --force
             ;;
         *)
             Console::error "Unknown build target '${subCommand}' is occurred. No action." >&2

bin/command/build/baked/export.sh

@@ -2,7 +2,7 @@
 
 Registry::addCommand "export" "Command::export"
 
-Registry::Help::command -c "export images" -a "[-t <tag>]" "Builds prod-like images (Yves, Zed, Glue, Frontend)."
+Registry::Help::command -c "export images" -a "[-t <tag>] [-d ecr]" "Builds prod-like images (Yves, Zed, Glue, Frontend)."
 Registry::Help::command -c "export assets" -a "[-t <tag>] [-p <path>]" "[DEPRECATED] Builds assets and export as archives stored by given path."
 
 function _assertDestinationDirectory() {
@@ -13,10 +13,12 @@ function _assertDestinationDirectory() {
 }
 
 function Command::export() {
+    local OPTIND=0
+    local opt
     local subCommand=''
     local tag=${SPRYKER_DOCKER_TAG}
     local destinationPath='./'
-    local pushDestination=''
+    local pushDestination='print'
 
     subCommand=${1}
     shift || true
@@ -32,14 +34,6 @@ function Command::export() {
                 ;;
             d)
                 pushDestination=${OPTARG}
-                local pushDestinationPath="sdk/images/baked/${pushDestination}.sh"
-                local pathToFile="${DEPLOYMENT_PATH}/bin/${pushDestinationPath}"
-                if [ ! -f "${pathToFile}" ]; then
-                    Console::error "\nUnknown export images destination - '${OPTARG}'."
-                    exit 1
-                fi
-
-                import ${pushDestinationPath}
                 ;;
             # Unknown option specified
             \?)
@@ -60,33 +54,27 @@ function Command::export() {
     done
     shift $((OPTIND - 1))
 
+    local pushDestinationPath="sdk/images/destination/${pushDestination}.sh"
+    if [ ! -f "${DEPLOYMENT_PATH}/bin/${pushDestinationPath}" ]; then
+        Console::error "\nUnknown export images destination - '${pushDestination}'."
+        exit 1
+    fi
+
+    import ${pushDestinationPath}
+
     case ${subCommand} in
         asset | assets)
-            Console::warn 'This command is DEPRECATED. Please, use just "export".'
+            Console::warn 'This command is DEPRECATED. Please, use just "export images".'
             _assertDestinationDirectory "${destinationPath}"
-            Images::buildApplication --force
-            Assets::build --force
-            Images::buildFrontend --force
-            Assets::export "${tag}" "${destinationPath}"
+            Images::export "${tag}" "print"
+            Assets::export "${tag}" "print" "${destinationPath}"
             ;;
         image | images)
-            Console::verbose "${INFO}Build and export images${NC}"
-            Images::buildApplication --force
-            Images::tagApplications "${tag}"
-            Assets::build --force
-            Images::buildFrontend --force
-            Images::tagFrontend "${tag}"
-
-            if [ -n "${pushDestination}" ]; then
-                Images::push "${tag}"
-            fi
-
-            if [ -z "${pushDestination}" ]; then
-                Images::printAll "${tag}"
-            fi
+            Images::export "${tag}" "${pushDestination}"
+            Images::print "${tag}" "${pushDestination}"
             ;;
         *)
-            Console::error "Unknown export '${subCommand}' is occurred. No action. Usage: ${HELP_SCR}${SELF_SCRIPT} export images [-t <tag>]" >&2
+            Console::error "Unknown export '${subCommand}' is occurred. No action. Usage: ${HELP_SCR}${SELF_SCRIPT} export images [-t <tag>] [-d ecr]" >&2
             exit 1
             ;;
     esac

bin/command/build/mount/build.sh

@@ -11,23 +11,18 @@ function Command::build() {
     subCommand=${1}
     case ${subCommand} in
         images | image)
-            Images::buildApplication --force
-            Codebase::build
-            Assets::build
-            Images::buildFrontend --force
+            Images::build --force
             ;;
         codebase | code)
             Codebase::build --force
             ;;
         assets | asset)
             Assets::build --force
-            Images::buildFrontend --force
             ;;
         '')
-            Images::buildApplication --force
+            Images::build --force
             Codebase::build --force
             Assets::build --force
-            Images::buildFrontend --force
             ;;
         *)
             Console::error "Unknown build target '${subCommand}' is occurred. No action." >&2

bin/command/install/bootstrap.sh

@@ -13,6 +13,8 @@ Registry::Help::command -s -c "bootstrap | boot" -a "[-v] <project-yml-file>" "P
 Registry::Help::command -s -c "bootstrap | boot" -a "[-v]" "Prepares all the files to run the application based on ${HELP_HIGH}deploy.local.yml${HELP_DESC} or ${HELP_HIGH}deploy.yml${HELP_DESC}."
 
 function Command::bootstrap() {
+    local OPTIND=0
+    local opt
 
     while getopts ":vsx" opt; do
         case ${opt} in
@@ -42,6 +44,7 @@ function Command::bootstrap() {
     shift $((OPTIND - 1))
 
     local gitHash=$(git rev-parse --verify HEAD 2>/dev/null || true)
+    local SPRYKER_SDK_REVISION="$(cd ${SOURCE_DIR} && git rev-parse --short HEAD 2>/dev/null || echo '')"
     local tmpDeploymentDir="${SOURCE_DIR}/deployment/_tmp"
     local defaultProjectYaml=$([ -f "./deploy.local.yml" ] && echo -n "./deploy.local.yml" || echo -n "./deploy.yml")
     local projectYaml=${1:-${defaultProjectYaml}}
@@ -75,11 +78,12 @@ function Command::bootstrap() {
     Console::info "Using ${projectYaml}"
 
     local USER_FULL_ID=$(Environment::getFullUserId)
+    local USER_UID="${USER_FULL_ID%%:*}"
 
     Console::verbose::start "Building generator..."
     docker build -t spryker_docker_sdk \
         -f "${SOURCE_DIR}/generator/Dockerfile" \
-        --build-arg="USER_UID=${USER_FULL_ID%%:*}" \
+        --build-arg="USER_UID=${USER_UID}" \
         -q \
         "${SOURCE_DIR}/generator" >/dev/null
     Console::end "[DONE]"
@@ -103,12 +107,13 @@ function Command::bootstrap() {
 
     # To support root user
     local userToRun=("-u" "${USER_FULL_ID}")
-    if [ "${USER_FULL_ID%%:*}" != '0' ]; then
+    if [ "${USER_UID}" != '0' ]; then
         userToRun=()
     fi
     docker run -i --rm "${userToRun[@]}" \
         -e SPRYKER_PLATFORM_IMAGE="${SPRYKER_PLATFORM_IMAGE:-""}" \
         -e SPRYKER_DOCKER_SDK_PLATFORM="${_PLATFORM}" \
+        -e SPRYKER_SDK_REVISION="${SPRYKER_SDK_REVISION}" \
         -e SPRYKER_DOCKER_SDK_DEPLOYMENT_DIR="${DESTINATION_DIR}" \
         -e VERBOSE="${VERBOSE}" \
         -v "${tmpDeploymentDir}":/data/deployment:rw \

bin/command/install/config.sh

@@ -23,11 +23,12 @@ function Command::config() {
     Console::info "Using ${projectYaml}"
 
     local USER_FULL_ID=$(Environment::getFullUserId)
+    local USER_UID="${USER_FULL_ID%%:*}"
 
     Console::verbose::start "Building generator..."
     docker build -t spryker_docker_sdk \
         -f "${SOURCE_DIR}/generator/deploy-file-generator/Dockerfile" \
-        --build-arg="USER_UID=${USER_FULL_ID%%:*}" \
+        --build-arg="USER_UID=${USER_UID}" \
         -q \
         "${SOURCE_DIR}/generator" >/dev/null
 
@@ -42,7 +43,7 @@ function Command::config() {
 
     # To support root user
     local userToRun=("-u" "${USER_FULL_ID}")
-    if [ "${USER_FULL_ID%%:*}" != '0' ]; then
+    if [ "${USER_UID}" != '0' ]; then
         userToRun=()
     fi
     docker run -i --rm "${userToRun[@]}" \

bin/environment/docker.sh

@@ -3,7 +3,7 @@
 export DOCKER_BUILDKIT=1
 
 require docker tr
-require:linux ip grep awk
+require:linux grep awk
 require:macos ipconfig
 require:windows tail cut
 
@@ -87,7 +87,11 @@ function Environment::getHostIp() {
     case ${_PLATFORM} in
         linux)
             if ! Environment::isWSL; then
-                myIp=$(ip route get 1 | sed 's/^.*src \([^ ]*\).*$/\1/;q')
+                if command -v ip &> /dev/null; then
+                    myIp=$(ip route get 1 | sed 's/^.*src \([^ ]*\).*$/\1/;q')
+                else
+                    myIp=$(hostname -i | awk '{ print $1 }')
+                fi
             fi
             ;;
         macos)

bin/registry/help.sh

@@ -19,6 +19,7 @@ function Registry::Help::separator() {
 
 function Registry::Help::command() {
     local OPTIND=0
+    local opt
     local OPTARG=''
     local OPTERR=''
     local envs=''

bin/sdk/assets/baked.sh

@@ -2,10 +2,11 @@
 
 function Assets::export() {
     # deprecated
-    local tag=${1}
-    local destinationPath=${2%/}
+    local TARGET_TAG=${1:-${SPRYKER_DOCKER_TAG}}
+    local destination=${2}
+    local destinationPath=${3%/}
 
-    local builderAssetsImage=$(Assets::getImageTag)
+    local builderAssetsImage
     local dockerAssetsTmpDirectory="/_tmp"
     local projectDockerAssetsTmpDirectory=${DEPLOYMENT_DIR}${dockerAssetsTmpDirectory}
 
@@ -19,6 +20,18 @@ function Assets::export() {
 
     Console::start "Preparing assets archives..."
 
+    source ${DEPLOYMENT_PATH}/images/export/${destination}.sh
+
+    local targetData
+    for targetData in "${TARGET_TAGS[@]}"; do
+        eval "${targetData}"
+
+        if [ "$TARGET" == 'frontend' ]; then
+            builderAssetsImage="${TAGS[0]}"
+            break
+        fi
+    done
+
     # To support root user
     local userToRun=("-u" "${USER_FULL_ID}")
     if [ "${USER_FULL_ID%%:*}" != '0' ]; then
@@ -29,7 +42,7 @@ function Assets::export() {
         -v "${DEPLOYMENT_DIR}/bin:/data/standalone" \
         -v "${projectDockerAssetsTmpDirectory}:/data${dockerAssetsTmpDirectory}" \
         --entrypoint='' \
-        --name="${SPRYKER_DOCKER_PREFIX}_builder_assets" \
+        --name="${SPRYKER_DOCKER_PREFIX}_frontend" \
         "${builderAssetsImage}" \
         sh -c "${command}" 2>&1
 
@@ -50,58 +63,12 @@ function Assets::export() {
     rm -rf "${projectDockerAssetsTmpDirectory}"
 }
 
-function Assets::getImageTag() {
-    echo -n "${SPRYKER_DOCKER_PREFIX}_builder_assets:${SPRYKER_DOCKER_TAG}-${SPRYKER_REPOSITORY_HASH}"
-}
-
 function Assets::areBuilt() {
-    Console::start "Checking assets are built..."
-
-    local builderAssetsImage=$(Assets::getImageTag)
-
-    if docker image inspect "${builderAssetsImage}" >/dev/null 2>&1; then
-        Console::end "[BUILT]"
-        return "${TRUE}"
-    fi
-
-    return "${FALSE}"
+    # Do nothing as everything is built before. Could be changed once assets are separated
+    :
 }
 
 function Assets::build() {
-
-    local force=''
-    if [ "$1" == '--force' ]; then
-        force=1
-        shift || true
-    fi
-
-    if [ -z "${force}" ] && Assets::areBuilt; then
-        return "${TRUE}"
-    fi
-
-    Console::start "Cleaning old assets..."
-
-    # ${XARGS_NO_RUN_IF_EMPTY} must be without quotes
-    # shellcheck disable=SC2086
-    docker images --filter "reference=${SPRYKER_DOCKER_PREFIX}_builder_assets:${SPRYKER_DOCKER_TAG}*" --format "{{.ID}}" | xargs ${XARGS_NO_RUN_IF_EMPTY} docker rmi -f
-
-    Console::end "[DONE]"
-    Console::start "Building assets..."
-
-    local builderAssetsImage=$(Assets::getImageTag)
-    local cliImage="${SPRYKER_DOCKER_PREFIX}_cli:${SPRYKER_DOCKER_TAG}"
-    local mode=${SPRYKER_ASSETS_MODE:-development}
-
-    docker build \
-        -t "${builderAssetsImage}" \
-        -f "${DEPLOYMENT_PATH}/images/baked/assets/Dockerfile" \
-        --progress="${PROGRESS_TYPE}" \
-        --build-arg "SPRYKER_PARENT_IMAGE=${cliImage}" \
-        --build-arg "SPRYKER_ASSETS_MODE=${mode}" \
-        --build-arg "SPRYKER_PIPELINE=${SPRYKER_PIPELINE}" \
-        --build-arg "SPRYKER_BUILD_HASH=${SPRYKER_BUILD_HASH:-"current"}" \
-        --build-arg "SPRYKER_BUILD_STAMP=${SPRYKER_BUILD_STAMP:-""}" \
-        . 1>&2
-
-    Console::end "[DONE]"
+    # Do nothing as everything is built before. Could be changed once assets are separated
+    :
 }

bin/sdk/assets/mount.sh

@@ -6,10 +6,6 @@ function Assets::export() {
     return "${FALSE}"
 }
 
-function Assets::getImageTag() {
-    echo -n "${SPRYKER_DOCKER_PREFIX}_cli:${SPRYKER_DOCKER_TAG}"
-}
-
 function Assets::areBuilt() {
     Console::start "Checking assets are built..."
 

bin/sdk/compose.sh

@@ -141,10 +141,9 @@ function Compose::up() {
       Compose::cleanSourceDirectory
     fi
 
-    Images::buildApplication ${noCache} ${doBuild}
+    Images::build ${noCache} ${doBuild}
     Codebase::build ${noCache} ${doBuild}
     Assets::build ${noCache} ${doAssets}
-    Images::buildFrontend ${noCache} ${doBuild}
     Compose::run --build
     Compose::command restart frontend gateway