2.x: Just using ce-dev:{version} and mariadb|mysql. Removed the creation of pre-built images like drupal10-web

Author: DionisioFG

.github/workflows/ubuntu-linux.yml

@@ -43,11 +43,10 @@ jobs:
           echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
           /bin/sh docker-images/export.sh --version 2.x --image-name ce-dev --dockerfile-path base --push
           /bin/sh docker-images/export.sh --version 2.x --image-name ce-dev-controller --dockerfile-path controller --push
-      - name: Test templates and push Drupal images to Docker
+      - name: Test templates with the previous images created
         run: |
           sudo chmod +x bin/run.js
-          echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-          /bin/sh templates/prebuild.sh --template ce-dev.compose.yml --push
+          /bin/sh templates/prebuild.sh --template ce-dev.compose.yml
       - name: Publish new ce-dev binaries
         uses: softprops/action-gh-release@v1
         with:

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

@@ -11,7 +11,7 @@ x-ce_dev:
     - 'https://www.{{ project_name }}.local'
 services:
   web:
-    image: 'codeenigma/drupal10-web:2.x'
+    image: 'codeenigma/ce-dev:2.x'
     platform: linux/amd64
     cgroup: host
     expose:
@@ -36,7 +36,7 @@ services:
     cap_add:
       - NET_ADMIN
   db:
-    image: 'codeenigma/drupal10-db:2.x'
+    image: 'mariadb'
     platform: linux/amd64
     environment:
       MYSQL_ROOT_PASSWORD: ce-dev

templates/localgov/ce-dev/ce-dev.compose.prebuilt.yml.j2

@@ -11,7 +11,7 @@ x-ce_dev:
     - 'https://www.{{ project_name }}.local'
 services:
   web:
-    image: 'codeenigma/drupal10-web:2.x'
+    image: 'codeenigma/ce-dev:2.x'
     platform: linux/amd64
     cgroup: host
     expose:
@@ -36,7 +36,7 @@ services:
     cap_add:
       - NET_ADMIN
   db:
-    image: 'codeenigma/drupal10-db:2.x'
+    image: 'mariadb'
     platform: linux/amd64
     environment:
       MYSQL_ROOT_PASSWORD: ce-dev

templates/prebuild.sh

@@ -76,27 +76,7 @@ test_project(){
   echo "$1"
 }
 
-# Build a project.
-# @param $1
-# Project name.
-build_project(){
-  cd "$WORK_DIR/$1"
-  $CE_DEV_BIN build --registry codeenigma
-}
-
-# Build a project.
-# @param $1
-# Project name.
-push_project(){
-  cd "$WORK_DIR/$1"
-  $CE_DEV_BIN push --anonymous --registry codeenigma
-}
-
 for PROJECT in $PROJECTS; do
  create_project "$PROJECT"
  test_project "$PROJECT"
- build_project "$PROJECT"
- if [ $PUSH = "yes" ]; then
-  push_project "$PROJECT"
- fi
 done