feat: release new version 2.0.8 with docker compose v2 IA-974 (#46)

Author: Nikolay Dimitrov

composer.json

@@ -6,7 +6,7 @@
     "php": ">7.0.1"
   },
   "type": "magento2-module",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "autoload": {
     "files": [
       "registration.php"

dev/jenkins/destroy.sh

@@ -12,7 +12,7 @@ else
   composefile="docker-compose.yml"
 fi
 
-alias compose="docker-compose -f $composefile"
+alias compose="docker compose -f $composefile"
 
 compose -p mage_unit_$VERSION down || echo "Could not stop Docker..."
-compose -p mage_e2e_$VERSION down || echo "Could not stop Docker..."
+compose -p mage_e2e_$VERSION down || echo "Could not stop Docker..."

dev/jenkins/run-e2e.sh

@@ -12,7 +12,10 @@ else
   composefile="docker-compose.yml"
 fi
 
-alias compose="docker-compose -p mage_e2e_$VERSION -f $composefile"
+project_version=$(echo "$VERSION" | tr '.' '_')
+echo "\n|--- Using docker compose project $project_version"
+
+alias compose="docker compose -p mage_e2e_$project_version -f $composefile"
 
 compose down
 

dev/jenkins/run-unit.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-set -e
+set +e
 
 BASEDIR=$(dirname "$0")
 cd $BASEDIR
@@ -12,7 +12,10 @@ else
   composefile="docker-compose.yml"
 fi
 
-alias compose="docker-compose -p mage_unit_$VERSION -f $composefile"
+project_version=$(echo "$VERSION" | tr '.' '_')
+echo "\n|--- Using docker compose project $project_version"
+
+alias compose="docker compose -p mage_unit_$project_version -f $composefile"
 
 compose down
 

dev/jenkins/wait.sh

@@ -2,14 +2,17 @@
 
 RUNNER=$1
 
+project_version=$(echo "$VERSION" | tr '.' '_')
+echo -e "\n|--- Using docker compose project $project_version"
+
 wait_it()
 {
   while :
   do
-    result=$(docker-compose -p "mage_${RUNNER}_${VERSION}" ps | grep magento)
-    echo $result
+    result=$(docker compose -p "mage_${RUNNER}_${project_version}" ps | grep magento)
+    echo -e $result
     if [ ! -z "$result" ]; then
-      healthy=$(echo $result | grep "Up (healthy)")
+      healthy=$(echo $result | grep "(healthy)")
       if [ ! -z "$healthy" ]; then
         echo "ready"
         break
@@ -24,4 +27,4 @@ wait_it()
   done
 }
 
-wait_it
+wait_it

dev/wait.sh

@@ -9,7 +9,7 @@ wait_it()
 {
   while :
   do
-    result=$(docker-compose -p "mage" ps | grep magento-test)
+    result=$(docker compose -p "mage" ps | grep magento-test)
     if [ ! -z "$result" ]; then
       healthy=$(echo $result | grep "Up (healthy)")
       if [ ! -z "$healthy" ]; then
@@ -28,4 +28,4 @@ wait_it()
   done
 }
 
-wait_it
+wait_it

etc/module.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-  <module name="Emartech_Emarsys" setup_version="2.0.7">
+  <module name="Emartech_Emarsys" setup_version="2.0.8">
     <sequence>
       <module name="Magento_Sales" />
     </sequence>