Skip to content

Commit

Permalink
Merge pull request #116 from shopware/remove-old-scripts
Browse files Browse the repository at this point in the history
fix: remove old deprecated scripts
  • Loading branch information
shyim authored Jan 22, 2025
2 parents 504c927 + 8a46b11 commit bfaa40e
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 160 deletions.
2 changes: 1 addition & 1 deletion fpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ARG REDIS_PHP_MODULE=redis

ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/

RUN apk add --no-cache icu-data-full curl jq trurl && \
RUN apk add --no-cache icu-data-full curl && \
apk upgrade --no-cache && \
chmod +x /usr/local/bin/install-php-extensions && \
install-php-extensions bcmath gd intl mysqli pdo_mysql pcntl sockets bz2 gmp soap zip ffi opcache ${REDIS_PHP_MODULE} apcu-5.1.24 amqp-2.1.2 zstd-0.13.3 && \
Expand Down
29 changes: 5 additions & 24 deletions fpm/rootfs/setup
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,13 @@ if [[ -e /var/www/html/vendor/bin/shopware-deployment-helper ]]; then
exec ./vendor/bin/shopware-deployment-helper run
fi

echo "### DEPRECATION ###"
echo "### ERROR ###"
echo ""
echo "### The setup scripts are deprecated and will be removed November 2024 ###"
echo "### Please install the Shopware Deployment Helper using composer require shopware/deployment-helper to get rid of this message ###"
echo "### The setup scripts are removed ###"
echo "### Please install the Shopware Deployment Helper using composer require shopware/deployment-helper to continue ###"
echo "### For more information see https://developer.shopware.com/docs/guides/hosting/installation-updates/deployments/deployment-helper.html ###"
echo ""
echo "### DEPRECATION ###"
echo "### ERROR ###"
echo ""
echo "Sleeping 30 seconds to make the deprecation visible."

sleep 30

set -x

shopware_version=$(jq '.packages[] | select (.name == "shopware/core") | .version' -r < composer.lock)
# shellcheck disable=SC2081,SC3010
if [[ $shopware_version != v6* ]]; then
shopware_version="v$(jq '.packages[] | select (.name == "shopware/core") | .extra."branch-alias"."dev-trunk"' -r < composer.lock)"
fi

# if shopware version starts with 6.6 echo 6.6
# shellcheck disable=SC2081,SC3010
if [[ $shopware_version == v6.6.* ]]; then
# shellcheck source-path=./fpm/rootfs source=./usr/local/shopware/setup_6.6.x
. /usr/local/shopware/setup_6.6.x
else
# shellcheck source-path=./fpm/rootfs source=./usr/local/shopware/setup_6.5.x
. /usr/local/shopware/setup_6.5.x
fi
exit 1
56 changes: 0 additions & 56 deletions fpm/rootfs/usr/local/shopware/functions.sh

This file was deleted.

35 changes: 0 additions & 35 deletions fpm/rootfs/usr/local/shopware/setup_6.5.x

This file was deleted.

44 changes: 0 additions & 44 deletions fpm/rootfs/usr/local/shopware/setup_6.6.x

This file was deleted.

0 comments on commit bfaa40e

Please sign in to comment.