Don't preinstall Blocks Cloner, allow installing concrete-cif (#80)

* Don't preinstall Blocks Cloner, allow installing concrete-cif

* Test installing Blocks Cloner and concrete-cif

* Ensure DB is started when installing Blocks Cloner

* More system cleanup, fix concrete-cif launcher

* Don't install openjdk recommendations

Author: mlocati

.github/workflows/build.yml

@@ -182,7 +182,6 @@ jobs:
               --build-arg CCM_C5_ARCHIVE=${{ matrix.data.c5_archive }} \
               --build-arg CCM_STARTING_POINT=${{ matrix.data.c5_startingpoint }} \
               --build-arg CCM_PATCH_ENVIRONMENT_ONLY=${{ matrix.data.patch_environment_only }} \
-              --build-arg CCM_INSTALL_BLOCKS_CLONER=${{ matrix.data.install_blocks_cloner }} \
               --tag ghcr.io/concrete5-community/docker5:${{ matrix.data.image_tag }} \
               ./installed
           for additional_tag in ${{ matrix.data.additional_tags }}; do
@@ -191,6 +190,14 @@ jobs:
       -
         name: Check that MariaDB works
         run: docker run --rm --entrypoint='' ghcr.io/concrete5-community/docker5:${{ matrix.data.image_tag }} ccm-service start db
+      -
+        name: Install Blocks Cloner
+        if: needs.check_envoronment.outputs.action == 'build' && matrix.data.image_tag == '9.4.1'
+        run: docker run --rm --entrypoint='' ghcr.io/concrete5-community/docker5:${{ matrix.data.image_tag }} ccm-install blocks_cloner
+      -
+        name: Install concrete-cif
+        if: needs.check_envoronment.outputs.action == 'build' && matrix.data.image_tag == '9.4.1'
+        run: docker run --rm --entrypoint='' ghcr.io/concrete5-community/docker5:${{ matrix.data.image_tag }} ccm-install concrete-cif
       -
         name: Remove base Docker image
         if: needs.check_envoronment.outputs.action == 'publish'

.github/workflows/generate-matrix

@@ -121,8 +121,6 @@ readonly class Version
 
     public bool $patchEnvironmentOnly;
 
-    public bool $installBlocksCloner;
-
     public function __construct(public string $version,  public string $archiveUrl)
     {
         $matches = null;
@@ -185,12 +183,6 @@ readonly class Version
         } else {
             $this->patchEnvironmentOnly = false;
         }
-
-        if (version_compare($this->comparableVersion, '8.5.4') >= 0) {
-            $this->installBlocksCloner = true;
-        } else {
-            $this->installBlocksCloner = false;
-        }
     }
 
     public function serialize(array &$result, array &$alreadySerializedVersions): void
@@ -239,7 +231,6 @@ readonly class Version
             'c5_archive' => $this->archiveUrl,
             'c5_startingpoint' => $full ? $this->fullStartingPoint : $this->blankStartingPoint,
             'patch_environment_only' => $this->patchEnvironmentOnly ? 'Y' : 'N',
-            'install_blocks_cloner' => $this->installBlocksCloner ? 'Y' : 'N',
             'image_tag' => array_shift($versions),
             'additional_tags' => implode(' ', $versions),
         ];

.github/workflows/ongoing-branch.yml

@@ -64,7 +64,6 @@ jobs:
               --build-arg CCM_C5_ARCHIVE=https://codeload.github.com/concretecms/concretecms/tar.gz/${{ steps.check.outputs.BUILD_SHA1 }} \
               --build-arg CCM_STARTING_POINT=${{ matrix.data.c5_startingpoint }} \
               --build-arg CCM_PATCH_ENVIRONMENT_ONLY=${{ matrix.data.patch_environment_only }} \
-              --build-arg CCM_INSTALL_BLOCKS_CLONER=${{ matrix.data.install_blocks_cloner }} \
               --tag ghcr.io/concrete5-community/docker5:${{ matrix.data.image_tag }} \
               ./installed
           for additional_tag in ${{ matrix.data.additional_tags }}; do

README.md

@@ -141,9 +141,25 @@ Source repository: https://github.com/concrete5-community/docker5
 docker5 images come with some service CLI commands.
 You can get a list of them by running the `ccm-help` CLI command.
 
-## Preinstalled Concrete packages
+## Installing additional components
 
-Images with concrete5/ConcreteCMS version 8.5.4 or later come with [Blocks Cloner](https://github.com/concrete5-community/blocks_cloner) preinstalled.
+You can install additional components with the `ccm-install` CLI command.
+
+### Blocks Cloner
+
+You can install [Blocks Cloner](https://github.com/concrete5-community/blocks_cloner) in a concrete5/ConcreteCMS version 8.5.4 or later come with:
+
+```sh
+ccm-install blocks_cloner
+```
+
+### Validator of CIF files
+
+You can install [concrete-cif](https://github.com/concretecms/concrete-cif) with:
+
+```sh
+ccm-install concrete-cif
+```
 
 ## PHP Versions
 

base/assets/bashrc

@@ -18,7 +18,7 @@ complete -F _ccm_service ccm-service
 _ccm_install() {
     case $COMP_CWORD in
         1)
-            COMPREPLY=( $(compgen -W 'blocks_cloner' -- "${COMP_WORDS[COMP_CWORD]}") )
+            COMPREPLY=( $(compgen -W 'blocks_cloner concrete-cif' -- "${COMP_WORDS[COMP_CWORD]}") )
             ;;
         *)
             COMPREPLY=()

base/assets/ccm-help

@@ -12,7 +12,7 @@ docker5 images come with the following CLI commands:
   Invoke it without arguments to get some help.
 
 - ccm-install: install or update additional stuff
-  (for example: Blocks Cloner).
+  (for example: Blocks Cloner, concrete-cif).
 
 - switch-composer: change the composer version to be used.
   Invoke it without arguments to get some help.

base/assets/ccm-install

@@ -6,10 +6,30 @@ set -o errexit
 script_name=$0
 
 exitWithSyntax() {
-    printf 'Syntax: %s <blocks_cloner>\n\nInstall or update additional stuff\n\n' "$script_name" >&2
+    printf 'Syntax: %s <blocks_cloner|concrete-cif>\n\nInstall or update additional stuff\n\n' "$script_name" >&2
     exit 1
 }
 
+installJava() {
+  if command -v java >/dev/null 2>&1; then
+    return
+  fi
+  installJava_cleanupApk=1
+  if [ -d "/var/lib/apt/lists" ]; then
+      if find "/var/lib/apt/lists" -maxdepth 1 -mindepth 1 -print -quit | grep -q .; then
+          installJava_cleanupApk=0
+      fi
+  fi
+  printf 'Installing Java...\n'
+  apt-get update -qy
+  apt-get install -qy --no-install-recommends openjdk-21-jdk-headless
+  java -version
+  if [ $installJava_cleanupApk -eq 1 ]; then
+      apt-get clean -qy
+      rm -rf /var/lib/apt/lists/* || true
+  fi
+}
+
 installBlocksCloner() {
   printf 'Installing Blocks Cloner...\n'
   if [ -d "/app/packages/blocks_cloner" ]; then
@@ -47,20 +67,38 @@ installBlocksCloner() {
   printf -- '- extracting... '
   if ! sudo -u www-data unzip -q -o "$installBlocksCloner_tmpFile" -d /app/packages; then
     rm -f "$installBlocksCloner_tmpFile" || true
+    if [ $installBlocksCloner_upgrading -eq 0 ]; then
+      rm -rf /app/packages/blocks_cloner || true
+    fi
     echo "Failed to extract Blocks Cloner." >&2
     exit 1
   fi
   rm -f "$installBlocksCloner_tmpFile" || true
   printf 'done\n'
+  ccm-service start db
   cd /app
   if [ $installBlocksCloner_upgrading -eq 1 ]; then
     c5 c5:update-package blocks_cloner
   else
-    c5 c5:install-package blocks_cloner
+    if ! c5 c5:install-package blocks_cloner; then
+      rm -rf /app/packages/blocks_cloner || true
+      cd - >/dev/null || true
+      exit 1
+    fi
   fi
   cd - >/dev/null || true
 }
 
+installConcreteCIF() {
+  installJava
+  printf 'Downloading Concrete CIF...\n'
+  curl -sSfL -o /usr/local/lib/concrete-cif.jar https://github.com/concretecms/concrete-cif/releases/latest/download/concrete-cif.jar
+  printf '#!/bin/sh\nexec java -jar /usr/local/lib/concrete-cif.jar "$@"\n' >/usr/local/bin/concrete-cif
+  chmod +x /usr/local/bin/concrete-cif
+  printf 'concrete-cif version: '
+  concrete-cif --version
+}
+
 subject=
 while :; do
     if test $# -lt 1; then
@@ -73,6 +111,12 @@ while :; do
             fi
             subject=$1
             ;;
+        concrete-cif)
+            if [ -n "$subject" ]; then
+                exitWithSyntax
+            fi
+            subject=$1
+            ;;
         *)
             exitWithSyntax
             ;;
@@ -87,4 +131,7 @@ case "$subject" in
     blocks_cloner)
         installBlocksCloner
         ;;
+    concrete-cif)
+        installConcreteCIF
+        ;;
 esac

base/build

@@ -98,6 +98,7 @@ apt-get remove -qy --autoremove --purge software-properties-common
 mkdir /app
 chown www-data:www-data /app
 ccm-service stop
+apt-get clean -qy
 rm -rf /var/lib/apt/lists/*
 npm cache clean --force
 rm -rf $HOME/.npm/_logs/*.log

gh-pages/src/Matrix.ts

@@ -9,7 +9,6 @@ interface RawEntry {
     c5_archive: string;
     c5_startingpoint: string;
     patch_environment_only: YN;
-    install_blocks_cloner: YN;
     image_tag: string;
     additional_tags?: string;
     repo_branch?: string;

installed/Dockerfile

@@ -6,7 +6,6 @@ ARG CCM_PHPUNIT_VERSION=8
 ARG CCM_C5_ARCHIVE=https://github.com/concretecms/concretecms/archive/master.tar.gz
 ARG CCM_STARTING_POINT=atomik_full
 ARG CCM_PATCH_ENVIRONMENT_ONLY=N
-ARG CCM_INSTALL_BLOCKS_CLONER=N
 
 COPY assets/app-patch /tmp/
 COPY assets/start-patch /tmp/

installed/build

@@ -69,11 +69,6 @@ c5 c5:install \
 
 sudo -u www-data -- mkdir --mode=0755 -p /app/application/languages/site
 
-if [ "${CCM_INSTALL_BLOCKS_CLONER:-}" = Y ]; then
-    printTitle 'Installing Blocks Cloner'
-    ccm-install blocks_cloner
-fi
-
 c5 c5:config set -g concrete.seo.url_rewriting true
 c5 c5:config set -g concrete.mail.method smtp
 c5 c5:config set -g concrete.mail.methods.smtp.server 127.0.0.1