From ff9ecd080e098ed72cb992f66113027783c2ccf3 Mon Sep 17 00:00:00 2001 From: marynamllieva Date: Fri, 6 Sep 2024 14:15:40 +0300 Subject: [PATCH] removed default for SPRYKER_PHP_IMAGE while building arguments --- bin/sdk/assets/baked.sh | 2 +- bin/sdk/images/common.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/sdk/assets/baked.sh b/bin/sdk/assets/baked.sh index 23089185..f9e9a4a1 100755 --- a/bin/sdk/assets/baked.sh +++ b/bin/sdk/assets/baked.sh @@ -97,7 +97,7 @@ function Assets::build() { -f "${DEPLOYMENT_PATH}/images/baked/assets/Dockerfile" \ --progress="${PROGRESS_TYPE}" \ --build-arg "SPRYKER_PARENT_IMAGE=${cliImage}" \ - --build-arg "SPRYKER_PHP_IMAGE=${SPRYKER_PHP_IMAGE:-spryker/php:8.2}" \ + --build-arg "SPRYKER_PHP_IMAGE=${SPRYKER_PHP_IMAGE}" \ --build-arg "SPRYKER_ASSETS_MODE=${mode}" \ --build-arg "SPRYKER_PIPELINE=${SPRYKER_PIPELINE}" \ --build-arg "SPRYKER_BUILD_HASH=${SPRYKER_BUILD_HASH:-"current"}" \ diff --git a/bin/sdk/images/common.sh b/bin/sdk/images/common.sh index 32325576..0cc6b6d7 100644 --- a/bin/sdk/images/common.sh +++ b/bin/sdk/images/common.sh @@ -53,7 +53,7 @@ function Images::_buildApp() { -f "${DEPLOYMENT_PATH}/images/common/application/Dockerfile" \ --progress="${PROGRESS_TYPE}" \ --build-arg "SPRYKER_PLATFORM_IMAGE=${SPRYKER_PLATFORM_IMAGE}" \ - --build-arg "SPRYKER_PHP_IMAGE=${SPRYKER_PHP_IMAGE:-spryker/php:8.2}" \ + --build-arg "SPRYKER_PHP_IMAGE=${SPRYKER_PHP_IMAGE}" \ --build-arg "SPRYKER_LOG_DIRECTORY=${SPRYKER_LOG_DIRECTORY}" \ --build-arg "SPRYKER_PIPELINE=${SPRYKER_PIPELINE}" \ --build-arg "APPLICATION_ENV=${APPLICATION_ENV}" \ @@ -74,7 +74,7 @@ function Images::_buildApp() { --secret "id=secrets-env,src=$SECRETS_FILE_PATH" \ --progress="${PROGRESS_TYPE}" \ --build-arg "SPRYKER_PARENT_IMAGE=${baseAppImage}" \ - --build-arg "SPRYKER_PHP_IMAGE=${SPRYKER_PHP_IMAGE:-spryker/php:8.2}" \ + --build-arg "SPRYKER_PHP_IMAGE=${SPRYKER_PHP_IMAGE}" \ --build-arg "SPRYKER_DOCKER_PREFIX=${SPRYKER_DOCKER_PREFIX}" \ --build-arg "SPRYKER_DOCKER_TAG=${SPRYKER_DOCKER_TAG}" \ --build-arg "USER_UID=${USER_FULL_ID%%:*}" \