Merge pull request #374 from manala/elao.app.docker/remove-jenkins

[Elao - App - Docker] Remove jenkins integration support
manala · Jun 12, 2023 · a87dab5 · a87dab5
2 parents 2a17ba4 + 420c9a5
commit a87dab5
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 788 deletions.
diff --git a/elao.app.docker/.manala.yaml b/elao.app.docker/.manala.yaml
@@ -7,11 +7,9 @@ manala:
       - .manala/certificates/ca.key
       - .manala/docker
       - .manala/github
-      - .manala/jenkins
       - .manala/make
       - .manala/.dockerignore
       - .manala/.gitignore
-      - .manala/Jenkinsfile.tmpl
       - .manala/Makefile.tmpl
       - Makefile.dist
       - README.md .manala/README.md
@@ -164,30 +162,6 @@ system:
 ###############
 
 integration:
-    jenkins:
-        # @schema {
-        #     "definitions": {
-        #         "pipeline": {"type": "object", "$id": "#pipeline",
-        #             "additionalProperties": false,
-        #             "properties": {
-        #                 "label": {"type": "string"},
-        #                 "parallel": {"type": "boolean"},
-        #                 "app": {"type": "string", "pattern": "^[a-z]+$"},
-        #                 "env": {"type": "object",
-        #                     "additionalProperties": {"type": ["string", "integer"]},
-        #                     "propertyNames": {"pattern": "^[A-Z_]+$"}
-        #                 },
-        #                 "junit": {"type": "string"},
-        #                 "artifacts": {"type": ["string", "array"]},
-        #                 "shell": {"type": "string"},
-        #                 "warn": {"type": "boolean"},
-        #                 "tasks": {"type": "array", "items": {"$ref": "#pipeline"}}
-        #             }
-        #         }
-        #     },
-        #     "$ref": "#pipeline"
-        # }
-        pipeline: {}
     github:
         # @schema {
         #     "definitions": {

diff --git a/elao.app.docker/.manala/Jenkinsfile.tmpl b/elao.app.docker/.manala/Jenkinsfile.tmpl
diff --git a/elao.app.docker/.manala/docker/services/elasticsearch/compose.yaml.tmpl b/elao.app.docker/.manala/docker/services/elasticsearch/compose.yaml.tmpl
@@ -1,4 +1,12 @@
+{{/* Elasticsearch version */}}
+{{- define "elasticsearch_version" -}}
+    {{- $elasticsearch_versions := dict 5 "5.6.16" 6 "6.8.23" 7 "7.17.9" 8 "8.1.3" -}}
+    {{- $version := .version -}}
+    {{- index $elasticsearch_versions ($version | toString) -}}
+{{- end -}}
+
 {{ if .Vars.system.elasticsearch.version -}}
+
 services:
 
     #################