Test environment Update to Magento 2.4.0

Author: Florian Horn

bin/setup

@@ -1,6 +1,6 @@
 #!/bin/bash
 BASE_URL=${1:-m2.localhost}
-MAGE_VERSION=${2:-2.3.3}
+MAGE_VERSION=${2:-2.4.0}
 
 # load the DB env information
 DIR="${BASH_SOURCE%/*}"
@@ -11,7 +11,7 @@ bin/restart
 sleep 1 #Ensure containers are started...
 
 echo "Downloading Magento ${MAGE_VERSION} with Sample data..."
-bin/root curl -o /var/www/html/magento.tar.gz http://pubfiles.nexcess.net/magento/ce-packages/magento2-with-samples-${MAGE_VERSION}.tar.gz
+bin/root curl -o /var/www/html/magento.tar.gz https://pubfiles.nexcess.net/magento/ce-packages/magento2-with-samples-${MAGE_VERSION}.tar.gz
 bin/rootnotty tar xvfz /var/www/html/magento.tar.gz
 bin/rootnotty rm /var/www/html/magento.tar.gz
 bin/rootnotty cp /var/www/html/nginx.conf.sample /var/www/html/nginx.conf
@@ -23,22 +23,27 @@ bin/root curl -o /usr/local/bin/magerun https://files.magerun.net/n98-magerun2-l
 bin/rootnotty chmod +x /usr/local/bin/magerun
 
 echo "Forcing reinstall of composer deps to ensure perms & reqs..."
-bin/clinotty composer install
+bin/clinotty composer global require hirak/prestissimo
+bin/clinotty composer update
 
 bin/clinotty bin/magento setup:install \
   --db-host=$MYSQL_HOST \
   --db-name=$MYSQL_DATABASE \
   --db-user=$MYSQL_USER \
   --db-password=$MYSQL_PASSWORD \
   --base-url=https://$BASE_URL/ \
+  --base-url-secure=https://$BASE_URL/ \
+  --backend-frontname=admin \
   --admin-firstname=Admin \
   --admin-lastname=User \
   --admin-email=admin@test.loc \
   --admin-user=magento \
   --admin-password=magento2\
-  --language=de_DE \
+  --language=en_US \
   --currency=EUR \
   --timezone=Europe/Berlin \
+  --search-engine=elasticsearch7 \
+  --elasticsearch-host=elasticsearch \
   --use-rewrites=1
 
 echo "Turning on developer mode.."
@@ -48,6 +53,12 @@ bin/clinotty bin/magento indexer:reindex
 echo "Forcing deploy of static content to speed up initial requests..."
 bin/clinotty bin/magento setup:static-content:deploy -f 
 
+echo "Re-indexing with Elasticsearch..."
+bin/clinotty bin/magento indexer:reindex
+
+echo "Disable Magento 2FAuth module..."
+bin/clinotty bin/magento module:disable Magento_TwoFactorAuth
+
 echo "Clearing the cache for good measure..."
 bin/clinotty bin/magento cache:flush
 
@@ -61,11 +72,13 @@ bin/clinotty composer require bitexpert/magento2-force-customer-login:*
 echo "Enabling Force Login module..."
 bin/clinotty bin/magento module:enable BitExpert_ForceCustomerLogin
 bin/clinotty bin/magento setup:upgrade
-bin/clinotty bin/magento setup:di:compile
 
 echo "Installing Sample data..."
 bin/clinotty bin/magento sampledata:deploy
 
+echo "Generating SSL certificate..."
+bin/setup-ssl $BASE_URL
+
 echo "Restarting containers with host bind mounts for dev..."
 bin/restart
 

bin/setup-ssl

@@ -0,0 +1,17 @@
+#!/bin/bash
+[ -z "$1" ] && echo "Please specify a domain (ex. mydomain.test)" && exit
+
+# Generate certificate authority if not already setup
+if ! docker-compose exec -T -u root app cat /root/.local/share/mkcert/rootCA.pem | grep -q 'BEGIN CERTIFICATE'; then
+  bin/setup-ssl-ca
+fi
+
+# Generate the certificate for the specified domain
+docker-compose exec -T -u root app mkcert -key-file nginx.key -cert-file nginx.crt "$@"
+echo "Moving key and cert to /etc/nginx/certs/..."
+docker-compose exec -T -u root app chown app:app nginx.key nginx.crt
+docker-compose exec -T -u root app mv nginx.key nginx.crt /etc/nginx/certs/
+
+# Restart nginx to apply the updates
+echo "Restarting containers to apply updates..."
+bin/restart

docker-compose.yml

@@ -5,13 +5,14 @@ version: "3"
 
 services:
   app:
-    image: markoshust/magento-nginx:1.13-7
+    image: markoshust/magento-nginx:1.18
     ports:
       - "80:8000"
       - "443:8443"
     links:
       - db
       - phpfpm
+      - elasticsearch
     volumes: &appvolumes
       - ~/.composer:/var/www/.composer
       - ~/.composer/auth.json:/var/www/html/auth.json
@@ -49,11 +50,19 @@ services:
       - sockdata:/sock
 
   phpfpm:
-    image: markoshust/magento-php:7.2-fpm-0
+    image: markoshust/magento-php:7.4-fpm
     links:
       - db
     volumes: *appvolumes
 
+  elasticsearch:
+    image: markoshust/magento-elasticsearch:7.6.2-2
+    ports:
+      - "9200:9200"
+      - "9300:9300"
+    environment:
+      - "discovery.type=single-node"
+
   db:
     image: mysql:5.7
     ports: