Merge remote-tracking branch 'origin/master'

README.md

@@ -9,6 +9,8 @@ Check if other docker projects are stopped! If you have something running, ports
 For recipes that involves private repositories, you will need the Github token which have access to those repositories.
 In case Github credentials are asked, put your username and the **Github Token in place of password**!
 
+Use other then **root** user, as composer and other parts of the system (like php container) may be very unhappy meeting one!
+
 Also, consider preconfiguring the git authentication to be cached globally. It will help a lot with recipes where several private repositories are involved:
 ```
 git config --global credential.helper cache
@@ -80,4 +82,4 @@ If you wish to run the part script on an existing docker configuration, you will
 The recipes for 6.4 modules are available in recipes b-6.4.x-branch. Please check it out, if you want to use those
 recipes.
 
-> **_NOTE:_** Don not forget that version 6.4 is not supported anymore.
+> **_NOTE:_** Don not forget that version 6.4 is not supported anymore.

module-graphql/b-7.1.x-components-graphql.sh

@@ -46,10 +46,13 @@ $SCRIPT_PATH/../parts/shared/require_demodata_package.sh -e"${edition}" -b"maste
 $SCRIPT_PATH/../parts/shared/require.sh -n"oxid-esales/developer-tools" -v"dev-b-7.1.x"
 $SCRIPT_PATH/../parts/shared/require.sh -n"oxid-esales/apex-theme" -v"dev-b-7.1.x"
 
-$SCRIPT_PATH/../parts/shared/require.sh -n"oxid-esales/graphql-base" -g"https://github.com/OXID-eSales/graphql-base-module" -v"dev-b-7.1.x"
-$SCRIPT_PATH/../parts/shared/require.sh -n"oxid-esales/graphql-storefront" -g"https://github.com/OXID-eSales/graphql-base-module" -v"dev-b-7.1.x"
+$SCRIPT_PATH/../parts/shared/require.sh -n"oxid-esales/graphql-base" -g"https://github.com/OXID-eSales/graphql-base-module.git" -v"dev-b-7.1.x"
+$SCRIPT_PATH/../parts/shared/require.sh -n"oxid-esales/graphql-storefront" -g"https://github.com/OXID-eSales/graphql-storefront-module.git" -v"dev-b-7.1.x"
 $SCRIPT_PATH/../parts/shared/require.sh -n"oxid-esales/graphql-configuration-access" -g"https://github.com/OXID-eSales/graphql-configuration-access.git" -v"dev-b-7.1.x"
 
+#master branch of demodata is required for tests.
+#$SCRIPT_PATH/../parts/shared/require.sh -n"oxid-esales/oxideshop-demodata-ee" -g"https://github.com/OXID-eSales/oxideshop_demodata_ee" -v"dev-master"
+
 git clone https://github.com/OXID-eSales/oxapi-documentation source/documentation/oxapi-documentation
 make docpath=./source/documentation/oxapi-documentation addsphinxservice
 make up

module-personalization-econda/b-7.0.x-ee-twig-dev/run.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+SCRIPT_PATH=$(dirname ${BASH_SOURCE[0]})
+
+cd $SCRIPT_PATH/../../../../ || exit
+
+# Prepare services configuration
+make setup
+make addbasicservices
+make file=services/adminer.yml addservice
+make file=services/selenium-chrome.yml addservice
+
+$SCRIPT_PATH/../../parts/b-7.0.x/start_shop.sh -eEE
+$SCRIPT_PATH/../../parts/shared/require_twig_components.sh -e"EE" -b"b-7.0.x"
+$SCRIPT_PATH/../../parts/shared/require_theme.sh -t"apex" -b"b-7.0.x"
+
+# Require demodata package
+docker compose exec -T \
+  php composer config repositories.oxid-esales/oxideshop-demodata-ee \
+  --json '{"type":"git", "url":"https://github.com/OXID-eSales/oxideshop_demodata_ee"}'
+docker compose exec -T php composer require oxid-esales/oxideshop-demodata-ee:dev-b-7.0.x --no-update
+
+# Clone Econda Tracking component to dev-packages directory and configure it in composer
+git clone https://github.com/OXID-eSales/econda-tracking-component.git --branch=b-7.0.x source/dev-packages/econda-tracking-component
+docker compose exec -T \
+  php composer config repositories.oxid-esales/econda-tracking-component \
+  --json '{"type":"path", "url":"./dev-packages/econda-tracking-component", "options": {"symlink": true}}'
+docker compose exec -T php composer require oxid-esales/econda-tracking-component:* --no-update
+
+# Clone Econda Analytics module to dev-packages directory and configure module in composer
+git clone https://github.com/OXID-eSales/personalization-module.git --branch=b-7.0.x source/dev-packages/personalization
+docker compose exec -T \
+  php composer config repositories.oxid-esales/personalization-module \
+  --json '{"type":"path", "url":"./dev-packages/personalization", "options": {"symlink": true}}'
+docker compose exec -T php composer require oxid-esales/personalization-module:* --no-update
+
+# Install all preconfigured dependencies
+docker compose exec -T php composer update --no-interaction
+
+# ensure database, add demodata
+$SCRIPT_PATH/../../parts/shared/setup_database.sh
+
+# activate module, create admin
+
+docker compose exec -T php bin/oe-console oe:module:activate oepersonalization
+
+docker compose exec -T php bin/oe-console oe:theme:activate apex
+$SCRIPT_PATH/../../parts/shared/create_admin.sh
+
+echo "Done!"

shop/b-7.2.x-components.sh

@@ -0,0 +1,64 @@
+#!/bin/bash
+
+# Flags possible:
+# -e for shop edition. Possible values: CE/PE/EE
+
+edition='EE'
+while getopts e: flag; do
+  case "${flag}" in
+  e) edition=${OPTARG} ;;
+  *) ;;
+  esac
+done
+
+SCRIPT_PATH=$(dirname ${BASH_SOURCE[0]})
+
+cd $SCRIPT_PATH/../../../ || exit
+
+# Prepare services configuration
+make setup
+make addbasicservices
+make file=services/adminer.yml addservice
+make file=services/node.yml addservice
+make file=services/selenium-chrome.yml addservice
+
+perl -pi\
+  -e 's#error_reporting = .*#error_reporting = E_ALL ^ E_WARNING ^ E_DEPRECATED#g;'\
+  containers/php/custom.ini
+
+perl -pi\
+  -e 's#/var/www/#/var/www/source/#g;'\
+  containers/httpd/project.conf
+
+perl -pi\
+  -e 's#PHP_VERSION=.*#PHP_VERSION=8.2#g;'\
+  .env
+
+mkdir source
+docker compose up --build -d php
+
+cp ${SCRIPT_PATH}/../parts/bases/composer.json.base ./source/composer.json
+
+$SCRIPT_PATH/../parts/shared/require_shop_edition_packages.sh -e"${edition}" -v"dev-b-7.2.x"
+$SCRIPT_PATH/../parts/shared/require_twig_components.sh -e"${edition}" -b"b-7.2.x"
+$SCRIPT_PATH/../parts/shared/require.sh -n"oxid-esales/developer-tools" -v"dev-b-7.2.x"
+$SCRIPT_PATH/../parts/shared/require_theme_dev.sh -t"apex" -b"b-7.2.x"
+
+$SCRIPT_PATH/../parts/shared/require_demodata_package.sh -e"${edition}" -b"b-7.2.x"
+
+docker compose exec php composer update --no-interaction
+make up
+
+$SCRIPT_PATH/../parts/shared/setup_database.sh
+docker compose exec -T php vendor/bin/oe-console oe:theme:activate apex
+
+$SCRIPT_PATH/../parts/shared/create_admin.sh
+
+# Register all related project packages git repositories
+mkdir -p .idea; mkdir -p source/.idea; cp "${SCRIPT_PATH}/../parts/bases/vcs.xml.base" .idea/vcs.xml
+perl -pi\
+  -e 's#</component>#<mapping directory="\$PROJECT_DIR\$/source/vendor/oxid-esales/oxideshop-ce" vcs="Git" />\n  </component>#g;'\
+  -e 's#</component>#<mapping directory="\$PROJECT_DIR\$/source/vendor/oxid-esales/oxideshop-pe" vcs="Git" />\n  </component>#g;'\
+  -e 's#</component>#<mapping directory="\$PROJECT_DIR\$/source/vendor/oxid-esales/oxideshop-ee" vcs="Git" />\n  </component>#g;'\
+  .idea/vcs.xml
+cp .idea/vcs.xml source/.idea/vcs.xml; perl -pi -e 's#/source/vendor/#/vendor/#g;' source/.idea/vcs.xml