Script improvements

.gitignore

@@ -4,3 +4,4 @@ docker-compose.override.yml
 .composer_cache
 .env
 default.vcl
+id_rsa

bin/install-sampledata

@@ -1,7 +1,6 @@
 #!/bin/bash
 echo " Installing sample data..."
-docker compose exec -u daemon -w /bitnami/magento magento bash rm -rf var/di/* var/generation/*
-docker compose exec -u daemon -w /bitnami/magento magento bin/magento deploy:mode:set developer
+docker compose exec -w /bitnami/magento magento bash -c "rm -rf var/di/* var/generation/*"
 docker compose exec -u daemon -w /bitnami/magento magento bin/magento sampledata:deploy
 docker compose exec -u daemon -w /bitnami/magento magento bin/magento setup:upgrade
 docker compose exec -u daemon -w /bitnami/magento magento bin/magento cache:clean

bin/shell

@@ -1,2 +1,6 @@
 #!/bin/bash
-docker compose exec -u daemon -w /bitnami/magento magento bash -c "$@"
+if [ -z "$1" ]; then
+    docker compose exec -u daemon -w /bitnami/magento magento bash
+else
+    docker compose exec -u daemon -w /bitnami/magento magento bash -c "$@"
+fi

bin/xdebug

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker compose exec magento /docker-entrypoint-init.d/xdebug.sh

docker-entrypoint-init.d/00-set-developper-mode.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+cd /bitnami/magento/ || exit 0
+bin/magento deploy:mode:set developer

docker-entrypoint-init.d/01-set-order_sequence.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+echo \
+"ALTER TABLE sequence_order_0 AUTO_INCREMENT = $(date +%s);" \
+"ALTER TABLE sequence_order_1 AUTO_INCREMENT = $(date +%s);" | \
+mysql -h $MAGENTO_DATABASE_HOST -P $MAGENTO_DATABASE_PORT_NUMBER -u $MAGENTO_DATABASE_USER $MAGENTO_DATABASE_NAME

docker-entrypoint-init.d/install-sequra.sh

@@ -5,9 +5,6 @@ cd /bitnami/magento/ || exit 0
 if [ "$SQ_M2_CORE_VERSION" = "local" ]; then
     php ./vendor/bin/composer config repositories.sequra/magento2-core path /Sequra/Core
     COMPOSER_MIRROR_PATH_REPOS=1 php ./vendor/bin/composer require sequra/magento2-core:^2.5
-    # mkdir -p ./app/code
-    # ln -s /Sequra ./app/code/Sequra
-    # composer update
 else
     composer require sequra/magento2-core:"$SQ_M2_CORE_VERSION"
 fi
@@ -16,11 +13,6 @@ composer require mageplaza/magento-2-spanish-language-pack:dev-master \
  mageplaza/magento-2-french-language-pack:dev-master \
  mageplaza/magento-2-italian-language-pack:dev-master;
 bin/magento config:set dev/template/allow_symlink 1
-# bin/magento config:set general/locale/code "$MAGENTO_LOCALE" 
-# bin/magento config:set general/locale/timezone "$MAGENTO_TIMEZONE"
-# bin/magento config:set general/country/default "$MAGENTO_COUNTRY"
-# bin/magento config:set currency/options/base "$MAGENTO_CURRENCY"
-# bin/magento config:set currency/options/default "$MAGENTO_CURRENCY"
 bin/magento module:enable Sequra_Core
 bin/magento deploy:mode:set developer
 bin/magento setup:upgrade

docker-entrypoint-init.d/enable-xdebug.sh → docker-entrypoint-init.d/xdebug.sh

@@ -1,8 +1,9 @@
 #!/bin/bash
-if [ $PHP_XDEBUG_ENABLED == 'yes' ]; then
-    echo "Installing xdebug"
-    apt-get update
-    apt-get install -y --no-install-recommends php-xdebug
+if [ -e /opt/bitnami/php/etc/conf.d/xdebug.ini ]; then
+    echo "Disabling xdebug"
+    rm -f /opt/bitnami/php/etc/conf.d/xdebug.ini
+else
+    echo "Enabling xdebug"
     cat <<EOF> /opt/bitnami/php/etc/conf.d/xdebug.ini
 zend_extension = xdebug.so
 
@@ -12,7 +13,5 @@ xdebug.discover_client_host = 0
 xdebug.client_port = 9003
 xdebug.client_host=host.docker.internal
 EOF
-
-else
-    echo "Skip xdebug installation"
-fi
+fi
+/opt/bitnami/scripts/php/reload.sh

teardown.sh

@@ -1,2 +1,3 @@
 #!/bin/bash
-docker compose down -v
+docker-compose down --rmi all --volumes --remove-orphans
+docker system prune -a