Merge remote-tracking branch 'upstream/master' into setup-integration-tests-m24

.github/workflows/shellcheck.yml

@@ -2,8 +2,14 @@ name: 'ShellCheck'
 
 on: 
   push:
-    branches: ["master"]
+    paths:
+    - 'compose/bin/**'
+    branches:
+    - "master"
+
   pull_request:
+    paths:
+    - 'compose/bin/**'
 
 jobs:
   shellcheck:

compose/bin/download

@@ -16,12 +16,12 @@ if [ ! -f ~/.docker-magento/magento2-"$1".tar.gz ]; then
 fi
 
 # Fallback download to hypernode if archive doesn't exist on Nexcess (smaller than 1MB)
-if [ "$(find ~/.docker-magento/magento2-"$1".tar.gz -size -1M)" ]; then
+if ! tar -tzf  ~/.docker-magento/magento2-"$1".tar.gz -O &>/dev/null; then
     (cd ~/.docker-magento && curl -o magento2-"$1".tar.gz -fOL https://www.magento.mirror.hypernode.com/releases/magento-"$1".tar.gz)
 fi
 
 # Final fallback. If no archive exists, let's use Composer!
-if [ ! -f ~/.docker-magento/magento2-"$1".tar.gz ]; then
+if ! tar -tzf  ~/.docker-magento/magento2-"$1".tar.gz -O &>/dev/null; then
     echo "Archive not found, or not yet available due to new version release."
     echo "Attempting install with Composer..."
     rm -rf src

compose/bin/setup

@@ -3,6 +3,9 @@ set -o errexit
 
 # shellcheck source=../env/db.env
 source env/db.env
+# shellcheck source=../env/magento.env
+source env/magento.env
+
 BASE_URL=${1:-magento2.test}
 
 ES_HOST=elasticsearch
@@ -41,15 +44,15 @@ bin/clinotty bin/magento setup:install \
   --db-password="$MYSQL_PASSWORD" \
   --base-url=https://"$BASE_URL"/ \
   --base-url-secure=https://"$BASE_URL"/ \
-  --backend-frontname=admin \
-  --admin-firstname=John \
-  --admin-lastname=Smith \
-  --admin-email=john.smith@gmail.com \
-  --admin-user=john.smith \
-  --admin-password=password123 \
-  --language=en_US \
-  --currency=USD \
-  --timezone=America/New_York \
+  --backend-frontname="$MAGENTO_ADMIN_FRONTNAME" \
+  --admin-firstname="$MAGENTO_ADMIN_FIRST_NAME" \
+  --admin-lastname="$MAGENTO_ADMIN_LAST_NAME" \
+  --admin-email="$MAGENTO_ADMIN_EMAIL" \
+  --admin-user="$MAGENTO_ADMIN_USER" \
+  --admin-password="$MAGENTO_ADMIN_PASSWORD" \
+  --language="$MAGENTO_LOCALE" \
+  --currency="$MAGENTO_CURRENCY" \
+  --timezone="$MAGENTO_TIMEZONE" \
   --amqp-host=rabbitmq \
   --amqp-port=5672 \
   --amqp-user=guest \

compose/bin/setup-composer-auth

@@ -28,7 +28,7 @@ elif [ $USE_PYTHON3 ]; then
 
     if [ -f "$GLOBAL_AUTH" ]; then
         PUBLIC_KEY=$(python3 -c "$PY3_USER" 2>/dev/null < "$GLOBAL_AUTH")
-        PRIVATE_KEY=$(python3 -c "$PY3_USER" 2>/dev/null < "$GLOBAL_AUTH")
+        PRIVATE_KEY=$(python3 -c "$PY3_PASS" 2>/dev/null < "$GLOBAL_AUTH")
     fi
 
     if [ -z "$PUBLIC_KEY" ] || [ -z "$PRIVATE_KEY" ]; then

compose/docker-compose.yml

@@ -45,6 +45,7 @@ services:
       - "9300:9300"
     environment:
       - "discovery.type=single-node"
+      - "ES_JAVA_OPTS=-Xms1g -Xmx1g"
 
   rabbitmq:
     image: rabbitmq:3.7-management-alpine

compose/env/magento.env

@@ -0,0 +1,9 @@
+MAGENTO_ADMIN_EMAIL=john.smith@gmail.com
+MAGENTO_ADMIN_FIRST_NAME=john
+MAGENTO_ADMIN_LAST_NAME=smith
+MAGENTO_ADMIN_USER=john.smith
+MAGENTO_ADMIN_PASSWORD=password123
+MAGENTO_ADMIN_FRONTNAME=admin
+MAGENTO_LOCALE=en_US
+MAGENTO_CURRENCY=USD
+MAGENTO_TIMEZONE=America/New_York