From 95a2e4dabddd941d3fdb14de2fdf04e48ea84be3 Mon Sep 17 00:00:00 2001
From: Jingsheng Wang <skyred@insready.com>
Date: Tue, 30 Jul 2024 11:28:30 +0800
Subject: [PATCH] Support D11

---
 .github/workflows/build-publish.yml | 22 ++++++++++++++++------
 {dev => 11-dev}/Dockerfile          |  2 +-
 9-dev/Dockerfile                    |  8 ++++++++
 README.md                           |  1 +
 4 files changed, 26 insertions(+), 7 deletions(-)
 rename {dev => 11-dev}/Dockerfile (91%)
 create mode 100644 9-dev/Dockerfile

diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml
index 63cf7a8..0ad4ca2 100644
--- a/.github/workflows/build-publish.yml
+++ b/.github/workflows/build-publish.yml
@@ -21,14 +21,14 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
-        name: Build and push - D9
-        id: docker_build_9
+        name: Build and push - D10
+        id: docker_build_10
         uses: docker/build-push-action@v2
         with:
-          context: ./9/
+          context: ./10/
           push: true
           tags: | 
-            insready/drupal-commerce:9
+            insready/drupal-commerce:10
             insready/drupal-commerce:latest
       -
         name: Build and push - D9 dev
@@ -36,10 +36,9 @@ jobs:
         uses: docker/build-push-action@v2
         continue-on-error: true
         with:
-          context: ./dev/
+          context: ./9-dev/
           push: true
           tags: | 
-            insready/drupal-commerce:dev
             insready/drupal-commerce:9-dev
       -
         name: Build and push - D10 dev
@@ -51,6 +50,17 @@ jobs:
           push: true
           tags: | 
             insready/drupal-commerce:10-dev
+            insready/drupal-commerce:dev
+      -
+        name: Build and push - D11 dev
+        id: docker_build_11_dev
+        uses: docker/build-push-action@v2
+        continue-on-error: true
+        with:
+          context: ./11-dev/
+          push: true
+          tags: | 
+            insready/drupal-commerce:11-dev
       -
         name: Update repo description
         uses: peter-evans/dockerhub-description@v2
diff --git a/dev/Dockerfile b/11-dev/Dockerfile
similarity index 91%
rename from dev/Dockerfile
rename to 11-dev/Dockerfile
index 9a2bd44..2386449 100644
--- a/dev/Dockerfile
+++ b/11-dev/Dockerfile
@@ -1,4 +1,4 @@
-FROM insready/drupal-dev:10
+FROM insready/drupal-dev:11
 
 # install the PHP extensions we need
 RUN docker-php-ext-install bcmath
diff --git a/9-dev/Dockerfile b/9-dev/Dockerfile
new file mode 100644
index 0000000..4c470fb
--- /dev/null
+++ b/9-dev/Dockerfile
@@ -0,0 +1,8 @@
+FROM insready/drupal-dev:9
+
+# install the PHP extensions we need
+RUN docker-php-ext-install bcmath
+
+# install Drupal Commerce 2.x https://docs.drupalcommerce.org/commerce2/developer-guide/install-update/installation#existing-site
+RUN composer config minimum-stability dev \
+    && composer require "drupal/commerce"
diff --git a/README.md b/README.md
index d9535a8..b2ddac3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # Supported tags and respective `Dockerfile` links
 
 -	[`10`, `latest` (*Dockerfile*)](https://github.com/INsReady/docker-drupal-commerce/blob/master/10/Dockerfile)
+-	[`11-dev` (*Dockerfile*)](https://github.com/INsReady/docker-drupal-commerce/blob/master/11-dev/Dockerfile)
 -	[`10-dev`, `dev` (*Dockerfile*)](https://github.com/INsReady/docker-drupal-commerce/blob/master/10-dev/Dockerfile)
 -	[`9-dev` (*Dockerfile*)](https://github.com/INsReady/docker-drupal-commerce/blob/master/9-dev/Dockerfile)