removed SPRYKER_PHP_IMAGE

spryker · Sep 6, 2024 · b3ab42d · b3ab42d
1 parent 860f899
commit b3ab42d
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 9 deletions.
diff --git a/bin/command/install/bootstrap.sh b/bin/command/install/bootstrap.sh
@@ -81,7 +81,6 @@ function Command::bootstrap() {
         -f "${SOURCE_DIR}/generator/Dockerfile" \
         --progress="${PROGRESS_TYPE:-auto}" \
         --build-arg="USER_UID=${USER_FULL_ID%%:*}" \
-        --build-arg="SPRYKER_PHP_IMAGE=${SPRYKER_PHP_IMAGE}" \
         -q \
         "${SOURCE_DIR}/generator" >/dev/null
     Console::end "[DONE]"

diff --git a/bin/command/install/config.sh b/bin/command/install/config.sh
@@ -29,7 +29,6 @@ function Command::config() {
         -f "${SOURCE_DIR}/generator/deploy-file-generator/Dockerfile" \
         --progress="${PROGRESS_TYPE:-auto}" \
         --build-arg="USER_UID=${USER_FULL_ID%%:*}" \
-        --build-arg="SPRYKER_PHP_IMAGE=${SPRYKER_PHP_IMAGE}" \
         -q \
         "${SOURCE_DIR}/generator" >/dev/null
 

diff --git a/bin/sdk/assets/baked.sh b/bin/sdk/assets/baked.sh
@@ -97,7 +97,6 @@ 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_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
@@ -53,7 +53,6 @@ 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_LOG_DIRECTORY=${SPRYKER_LOG_DIRECTORY}" \
         --build-arg "SPRYKER_PIPELINE=${SPRYKER_PIPELINE}" \
         --build-arg "APPLICATION_ENV=${APPLICATION_ENV}" \
@@ -74,7 +73,6 @@ 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_DOCKER_PREFIX=${SPRYKER_DOCKER_PREFIX}" \
         --build-arg "SPRYKER_DOCKER_TAG=${SPRYKER_DOCKER_TAG}" \
         --build-arg "USER_UID=${USER_FULL_ID%%:*}" \

diff --git a/generator/Dockerfile b/generator/Dockerfile
@@ -1,6 +1,5 @@
 # syntax = docker/dockerfile:experimental
-ARG SPRYKER_PHP_VERSION=8.2
-ARG SPRYKER_PHP_IMAGE=spryker/php:${SPRYKER_PHP_VERSION}
+ARG SPRYKER_PHP_IMAGE=spryker/php:8.2
 
 FROM ${SPRYKER_PHP_IMAGE}
 

diff --git a/generator/deploy-file-generator/Dockerfile b/generator/deploy-file-generator/Dockerfile
@@ -1,6 +1,5 @@
 # syntax = docker/dockerfile:experimental
-ARG SPRYKER_PHP_VERSION=8.2
-ARG SPRYKER_PHP_IMAGE=spryker/php:${SPRYKER_PHP_VERSION}
+ARG SPRYKER_PHP_IMAGE=spryker/php:8.2
 
 FROM ${SPRYKER_PHP_IMAGE}