Added Drupal 11 template and changed devel references to devel-2.x

.github/workflows/README.md

@@ -19,7 +19,7 @@ docker pull codeenigma/ce-dev-controller:2.x
 Then edit your project's `ce-dev.compose.yml` file, changing the image for each applicable service to use the `-devel` tag instead of the current tag, for example:
 
 ```yaml
-    image: codeenigma/ce-dev:2.x -> image: codeenigma/ce-dev:2.x-devel 
+    image: codeenigma/ce-dev:2.x -> image: codeenigma/ce-dev:devel-2.x 
 ```
 
 Finally, destroy and recreate your `docker compose` file and containers:
@@ -36,9 +36,9 @@ ce-dev deploy
 To test the `devel` version of the `ce-dev-controller` image locally you can do the following:
 
 ```bash
-docker pull codeenigma/ce-dev-controller:2.x-devel
+docker pull codeenigma/ce-dev-controller:devel-2.x
 # Replace the 'latest' tag with your 'devel' image
-docker tag codeenigma/ce-dev-controller:2.x-devel codeenigma/ce-dev-controller:2.x
+docker tag codeenigma/ce-dev-controller:devel-2.x codeenigma/ce-dev-controller:2.x
 docker kill ce_dev_controller
 # Then in any ce-dev project
 ce-dev start

.github/workflows/devel-ubuntu-build.yml

@@ -1,17 +1,17 @@
-name: '2.x-devel: Ubuntu - Build and push ce-dev and ce-dev-controller images'
+name: 'devel-2.x: Ubuntu - Build and push ce-dev and ce-dev-controller images'
 
 on:
   push:
     branches:
-      - 2.x-devel
+      - devel-2.x
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: '2.x-devel'
+          ref: 'devel-2.x'
       - name: Install modules
         run: yarn install --production=false --global
       - name: Pack the JS
@@ -36,8 +36,8 @@ jobs:
           echo 'docker_bin: docker' > ~/.config/ce-dev/preferences-2.x.yml
           echo 'docker_compose_bin: docker compose' >> ~/.config/ce-dev/preferences-2.x.yml
           echo 'mkcert_bin: mkcert' >> ~/.config/ce-dev/preferences-2.x.yml
-      - name: Build ce-dev and ce-dev-controller
+      - name: Build and push ce-dev and ce-dev-controller
         run: |
           echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-          /bin/sh docker-images/export.sh --version 2.x-devel --image-name ce-dev --dockerfile-path base-devel --push
-          /bin/sh docker-images/export.sh --version 2.x-devel --image-name ce-dev-controller --dockerfile-path controller-devel --push
+          /bin/sh docker-images/export.sh --version devel-2.x --image-name ce-dev --dockerfile-path base-devel --push
+          /bin/sh docker-images/export.sh --version devel-2.x --image-name ce-dev-controller --dockerfile-path controller-devel --push

.github/workflows/devel-ubuntu-pr.yml

@@ -1,19 +1,17 @@
-name: '2.x-devel: Ubuntu - Test image builds on PR'
+name: 'devel-2.x: Ubuntu - Test image builds on PR'
 
 on:
   pull_request:
     types:
       - opened
     branches:
-      - 2.x-devel
+      - devel-2.x
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: '2.x-devel'
       - name: Install modules
         run: yarn install --production=false --global
       - name: Pack the JS
@@ -41,9 +39,9 @@ jobs:
           echo 'mkcert_bin: mkcert' >> ~/.config/ce-dev/preferences-2.x.yml
       - name: Build ce-dev and ce-dev-controller
         run: |
-          /bin/sh docker-images/export.sh --version 2.x-devel --image-name ce-dev --dockerfile-path base-devel
-          /bin/sh docker-images/export.sh --version 2.x-devel --image-name ce-dev-controller --dockerfile-path controller-devel
+          /bin/sh docker-images/export.sh --version devel-2.x --image-name ce-dev --dockerfile-path base-devel
+          /bin/sh docker-images/export.sh --version devel-2.x --image-name ce-dev-controller --dockerfile-path controller-devel
       - name: Testing templates
         run: |
           sudo chmod +x bin/dev.js
-          /bin/sh templates/prebuild.sh --template ce-dev-devel.compose.yml --devel
+          /bin/sh templates/test.sh --template ce-dev-devel.compose.yml --devel

.github/workflows/ubuntu-pr.yml

@@ -12,8 +12,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: '2.x'
       - name: Install modules
         run: yarn install --production=false --global
       - name: Pack the JS
@@ -46,4 +44,4 @@ jobs:
       - name: Testing templates
         run: |
           sudo chmod +x bin/run.js
-          /bin/sh templates/prebuild.sh --template ce-dev.compose.yml
+          /bin/sh templates/test.sh --template ce-dev.compose.yml

.gitignore

@@ -8,3 +8,4 @@ node_modules
 oclif.manifest.json
 tsconfig.tsbuildinfo
 .idea/
+.yarn/

README.md

@@ -2,7 +2,7 @@ ce-dev 2.x
 ======
 Local Stack wrapper tool
 
-[![2.x: Linux - Build ce_dev binaries, images and templates (test)](https://github.com/codeenigma/ce-dev/actions/workflows/ce-dev-devel-linux.yml/badge.svg?branch=2.x-devel)](https://github.com/codeenigma/ce-dev/actions/workflows/ce-dev-devel-linux.yml)
+[![2.x: Linux - Build ce_dev binaries, images and templates (test)](https://github.com/codeenigma/ce-dev/actions/workflows/ce-dev-devel-linux.yml/badge.svg?branch=devel-2.x)](https://github.com/codeenigma/ce-dev/actions/workflows/ce-dev-devel-linux.yml)
 [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=codeenigma_ce-dev&metric=security_rating)](https://sonarcloud.io/dashboard?id=codeenigma_ce-dev)
 [![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=codeenigma_ce-dev&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=codeenigma_ce-dev)
 [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=codeenigma_ce-dev&metric=bugs)](https://sonarcloud.io/dashboard?id=codeenigma_ce-dev)
@@ -36,7 +36,7 @@ Local Stack wrapper tool
 
 * Install Node.js in your local machine https://nodejs.org/en/download/package-manager
 * Clone this repo in your local machine.
-* Change the branch (2.x, 2.x-devel, etc...) to work on it.
+* Change the branch (2.x, devel-2.x, etc...) to work on it.
 * Run ```npm install```
 
 With these steps you will have all the packages installed.
@@ -84,7 +84,7 @@ codeenigma/ce-dev              2.x                8753195771fc   3 days ago
 codeenigma/ce-dev-controller   2.x                5aed115a5e74   3 days ago      1.83GB
 ```
 
-if you are testing the devel version, the tag will be 2.x-devel.
+if you are testing the devel version, the tag will be devel-2.x.
 
 If you don't have the local images, you can follow these steps:
 
@@ -95,7 +95,7 @@ If you don't have the local images, you can follow these steps:
 ```angular2html
 /bin/sh docker-images/export.sh --version 2.x --image-name ce-dev --dockerfile-path base
 /bin/sh docker-images/export.sh --version 2.x --image-name ce-dev-controller --dockerfile-path controller
-/bin/sh templates/prebuild.sh --template ce-dev.compose.yml
+/bin/sh templates/test.sh --template ce-dev.compose.yml
 ```
 
 The last step will generate the drupal10-web, drupal10-db and blank docker images. Also, it will create docker containers

RELEASE

@@ -1,18 +1,6 @@
-2.0.0
+2.0.1
 
-## Changes since 1.2.4
+## Changes since 2.0.0
 
-* Docker images based on Bookworm-slim
-* Docker image MariaDB used as database.
-* Docker image codeenigma/ce-dev:2.x image used web image
-* No more use of different predefined drupalX-web images, we rely on 'ce-dev provision'.
-* Use of latest Typescript version (5.x.x)
-* Binaries built with Emacs instead of Commonjs: Emacs can consume Commonjs modules,
-  but Commonjs can't consume Emacs modules. It means we can use more contrib modules
-* src folder has been organised a bit better.
-* Removed drupal 8 and drupal 9 templates.
-* The way to assign IPs have changed.
-* Improved command 'shell'
-* Added new command 'drush'
-* Removed references to win-x
-* All the packages used are up to date.
+* Added Drupal 11 template
+* Updated references to 2.x-devel with devel-2.x

docker-images/controller-devel/Dockerfile

@@ -1,4 +1,4 @@
-FROM codeenigma/ce-dev:2.x-devel
+FROM codeenigma/ce-dev:devel-2.x
 
 RUN \
   set -x && \

docker-images/export.sh

@@ -8,7 +8,7 @@ usage(){
   echo 'Export a base Code Enigma image, optionally pushing it to your Docker repository.'
   echo ''
   echo 'Mandatory arguments:'
-  echo '--version: Version tag to apply to the Docker image, e.g. "2.x, 2.x-devel, latest".'
+  echo '--version: Version tag to apply to the Docker image, e.g. "2.x, devel-2.x, latest".'
   echo '--image-name: Name of the resulting Docker image, e.g. "ce-dev".'
   echo ''
   echo 'Available options:'

package.json

@@ -1,11 +1,9 @@
 {
   "name": "ce-dev",
   "description": "Local Stack wrapper tool",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "author": "Codeenigma",
-  "bin": {
-    "ce-dev": "./bin/run.js"
-  },
+  "bin": "./bin/run.js",
   "bugs": "https://github.com/codeenigma/ce-dev/issues",
   "homepage": "https://github.com/codeenigma/ce-dev",
   "license": "MIT",
@@ -72,5 +70,6 @@
     "renamedist": "renamer --chain renamedist.js dist/*"
   },
   "types": "lib/index.d.ts",
-  "type": "module"
+  "type": "module",
+  "packageManager": "yarn@4.5.3"
 }

src/commands/create.ts

@@ -75,6 +75,7 @@ export default class CreateCmd extends BaseCmd {
       const response = await inquirer.prompt([{
         choices: [
           'drupal10',
+          'drupal11',
           'localgov',
           'blank',
         ],

templates/blank/ce-dev/ce-dev-devel.compose.yml.j2

@@ -10,7 +10,7 @@ x-ce_dev:
   version: 2.x
 services:
   {{ project_name }}:
-    image: codeenigma/ce-dev:2.x-devel
+    image: codeenigma/ce-dev:devel-2.x
     platform: linux/amd64
     cgroup: host
     cap_add:

templates/drupal10/ce-dev/ce-dev-devel.compose.yml.j2

@@ -11,7 +11,7 @@ x-ce_dev:
     - https://www.{{ project_name }}.local
 services:
   web:
-    image: codeenigma/ce-dev:2.x-devel
+    image: codeenigma/ce-dev:devel-2.x
     platform: linux/amd64
     cgroup: host
     expose:

templates/drupal11/.gitignore

@@ -0,0 +1,2 @@
+vendor
+node_modules

templates/drupal11/ce-dev/.gitignore

@@ -0,0 +1,2 @@
+*.retry
+docker-compose.yml