OPSEXP-2961 Disable services for solr6 overrides using reset yaml tag and bump pre-commit repos versions

.pre-commit-config.yaml

@@ -2,11 +2,11 @@
 repos:
   # General hooks section
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v5.0.0
     hooks:
       - id: check-yaml
         args: [--allow-multiple-documents]
-        exclude: (helm/.*/templates)|(updatecli.d/.*-manifest.ya?ml)
+        exclude: (helm/.*/templates)|(updatecli.d/.*-manifest.ya?ml)|(docker-compose/solr6-overrides.yaml)
       - id: check-json
       - id: check-merge-conflict
       - id: fix-byte-order-marker
@@ -16,19 +16,19 @@ repos:
         exclude: README.md
   # Helm hooks section (excluded in pre-commit-compose workflow)
   - repo: https://github.com/norwoodj/helm-docs
-    rev: v1.11.0
+    rev: v1.14.2
     hooks:
       - id: helm-docs
   - repo: https://github.com/Alfresco/alfresco-build-tools
-    rev: v2.1.0
+    rev: v8.4.0
     hooks:
       - id: helm-deps-build
   - repo: https://github.com/gruntwork-io/pre-commit
     rev: v0.1.24
     hooks:
       - id: helmlint
   - repo: https://github.com/bridgecrewio/checkov.git
-    rev: 2.3.288
+    rev: 3.2.326
     hooks:
       - id: checkov
         types: [yaml]
@@ -39,12 +39,13 @@ repos:
           - .checkov.yaml
   # Docker Compose hooks section (excluded in pre-commit-helm workflow)
   - repo: https://github.com/IamTheFij/docker-pre-commit
-    rev: v2.1.1
+    rev: v3.0.1
     hooks:
       - id: docker-compose-check
-        exclude: solr6-overrides.yaml
+        files : docker-compose/.*compose.yaml
+
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.37.0
+    rev: v0.43.0
     hooks:
       - id: markdownlint
         args: ["--ignore", "helm/**/README.md"]

docker-compose/solr6-overrides.yaml

@@ -49,9 +49,5 @@ services:
     ports:
       - "8083:8983" # Browser port
   # Disable the default elastcisearch service
-  search:
-    image: busybox:musl
-    command: "true"
-  search-reindexing:
-    image: busybox:musl
-    command: "true"
+  search: !reset []
+  search-reindexing: !reset []

docs/docker-compose/README.md

@@ -189,7 +189,7 @@ the containers in the deployment.
 | Property          | Description                                                                                                                                                                                                                                                                                                                                                                         | Default value |
 |-------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------|
 | JAVA_TOOL_OPTIONS | Adding this environment variable, allows to set sensitive values (like passwords) that are not passed as arguments to the Java Process.                                                                                                                                                                                                                                           |               |
-| JAVA_OPTS         | A set of properties that are picked up by the JVM inside the container. Any ACS property can be passed to the container using the following format `"-Dproperty=value"` (e.g. `-Ddb.driver=org.postgresql.Driver`). |
+| JAVA_OPTS         | A set of properties that are picked up by the JVM inside the container. Any ACS property can be passed to the container using the following format `"-Dproperty=value"` (e.g. `-Ddb.driver=org.postgresql.Driver`). | |
 
 ### Alfresco Share (share)