[Elao - App] Introduce hosts config

elao.app/.manala.yaml

@@ -5,6 +5,7 @@ manala:
       - .manala/docker
       - .manala/jenkins
       - .manala/make
+      - .manala/ssh
       - .manala/.gitignore
       - README.md .manala/README.md
       - .manala.yaml.tmpl.dist
@@ -14,30 +15,154 @@ manala:
 ##########
 
 system:
+    # @schema {"enum": [9, 8]}
     version: 9
+    # @schema {"type": "string", "format": "domain"}
     hostname: app.vm
     php:
+        # @schema {"enum": [null, 7.4, 7.3, 7.2, 7.1, "7.0", 5.6]}
+        version: ~
+        # @schema {"items": {"type": "string"}}
+        extensions: []
+    symfony:
+        # @schema {"enum": [null, "*"]}
         version: ~
     nodejs:
+        # @schema {"enum": [null, 12, 10, 8, 6]}
         version: ~
     mysql:
+        # @schema {"enum": [null, 5.7, 5.6]}
         version: ~
     mariadb:
+        # @schema {"enum": [null, 10.3, 10.2, 10.1, "10.0"]}
+        version: ~
+    elasticsearch:
+        # @schema {"enum": [null, 7, 6, 5, 2, 1.7, 1.6, 1.5]}
         version: ~
+        # @schema {"items": {"type": "string"}}
+        plugins: []
     apt:
+        # @schema {"items": {"type": "string"}}
         packages: []
     ssh:
+        # @schema {"type": ["null", "string"]}
         config: ~
 
+#########
+# Hosts #
+#########
+
+# @schema {
+#     "definitions": {
+#         "host": {"type": "object", "$id": "#host",
+#             "properties": {
+#                 "host": { "type": "string", "format": "hostname" },
+#                 "port": { "type": "string", "pattern": "[0-9]+" },
+#                 "user": { "type": "string" }
+#             },
+#             "required": ["host"]
+#         }
+#     },
+#     "type": "object",
+#     "additionalProperties": { "$ref": "#host" },
+#     "propertyNames": {"pattern": "^[a-z0-9\\-]+$"}
+#}
+hosts: {}
+
+########
+# Sync #
+########
+
+# @schema {
+#     "definitions": {
+#         "host": {"type": "object", "$id": "#sync",
+#             "properties": {
+#                 "src": { "type": "string", "pattern": "^[a-z0-9\\-]+$" },
+#                 "dest": { "type": "string", "pattern": "^[a-z0-9\\-]+$" },
+#                 "files": { "type": "array", "items": { "type": "string" } }
+#             },
+#             "required": ["src", "files"]
+#         }
+#     },
+#     "type": "object",
+#     "additionalProperties": { "$ref": "#host" },
+#     "propertyNames": {"pattern": "^[a-z0-9\\-@]+$"}
+#}
+sync: {}
+
 ###############
 # Integration #
 ###############
 
-integration:
-    tasks: []
+# @schema {
+#     "definitions": {
+#         "integration": {"type": "object", "$id": "#integration",
+#             "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"},
+#                 "shell": {"type": "string"},
+#                 "warn": {"type": "boolean"},
+#                 "tasks": {"type": "array", "items": {"$ref": "#integration"}}
+#             }
+#         }
+#     },
+#     "$ref": "#integration"
+# }
+integration: {}
 
 ############
 # Releases #
 ############
 
+# @schema {
+#     "definitions": {
+#         "release": {"type": "object", "$id": "#release",
+#             "additionalProperties": false,
+#             "properties": {
+#                 "app": {"type": "string", "pattern": "^[a-z]+$"},
+#                 "mode": {"enum": ["production", "staging"]},
+#                 "repo": {"type": "string", "format": "git-repo"},
+#                 "release_tasks": {"type": "array", "items": {"$ref": "#release_tasks"}},
+#                 "release_add": {"type": "array", "items": {"type": "string"}},
+#                 "release_removed": {"type": "array", "items": {"type": "string"}},
+#                 "deploy_hosts": {"type": "array", "items": {"$ref": "#release_hosts"}},
+#                 "deploy_dir": {"type": "string", "format": "file-path"},
+#                 "deploy_releases": {"type": "integer"},
+#                 "deploy_tasks": {"type": "array", "items": {"$ref": "#release_tasks"}},
+#                 "deploy_post_tasks": {"type": "array", "items": {"$ref": "#release_tasks"}},
+#                 "deploy_shared_files": {"type": "array", "items": {"type": "string"}},
+#                 "deploy_shared_dirs": {"type": "array", "items": {"type": "string"}},
+#                 "deploy_writable_dirs": {"type": "array", "items": {"type": "string"}}
+#             },
+#             "dependencies": {
+#                 "deploy_hosts": ["deploy_dir"]
+#             },
+#             "required": ["mode", "repo"]
+#         },
+#         "release_tasks": {"type": "object", "$id": "#release_tasks",
+#             "additionalProperties": false,
+#             "properties": {
+#                 "shell": {"type": "string"}
+#             }
+#         },
+#         "release_hosts": {"type": "object", "$id": "#release_hosts",
+#             "additionalProperties": true,
+#             "properties": {
+#                 "ssh_host": {"type": "string", "format": "hostname"},
+#                 "ssh_user": {"type": "string"},
+#                 "ssh_args": {"type": "string"}
+#             },
+#             "required": ["ssh_host"]
+#         }
+#     },
+#     "items": {"$ref": "#release"}
+# }
 releases: []

elao.app/.manala.yaml.tmpl.dist

@@ -11,8 +11,8 @@ manala:
 ##########
 
 system:
-    version: {{ .Vars.system.version }}
-    hostname: {{ .Vars.system.hostname }}
+    version: {{ .Vars.system.version | toYaml }}
+    hostname: {{ .Vars.system.hostname | toYaml }}
     # php:
     #     version: 7.3
     #     extensions:
@@ -23,5 +23,7 @@ system:
     #       - xml
     #       # App
     #       - mysql
+    # symfony:
+    #     version: "*"
     # nodejs:
     #     version: 12

elao.app/.manala/ansible/deploy.yaml

@@ -3,4 +3,4 @@
 - hosts: all
   any_errors_fatal: true
   roles:
-      - deploy
+    - deploy

elao.app/.manala/ansible/release.yaml

@@ -2,4 +2,4 @@
 
 - hosts: all
   roles:
-      - release
+    - release

elao.app/.manala/ansible/roles/release/tasks/main.yml

@@ -19,7 +19,7 @@
 - name: Release directory "{{ release_dir }}"
   shell: >
     rm --recursive --force {{ release_dir }}
-    && mkdir --parents {{ release_dir }}
+    && mkdir -p {{ release_dir }}
   args:
     warn: false
   tags: log_failed

elao.app/.manala/docker/Dockerfile.tmpl

@@ -17,7 +17,7 @@ RUN \
     # Disable all debian user interaction
     && export DEBIAN_FRONTEND="noninteractive" \
     && apt-get update \
-    && apt-get install -y --no-install-recommends \
+    && apt-get install --yes --no-install-recommends \
         bash bash-completion \
         apt-utils apt-transport-https \
         ca-certificates \
@@ -32,7 +32,7 @@ RUN \
         git \
         rsync \
     # Srv
-    && mkdir --parents /srv \
+    && mkdir -p /srv \
     && chmod 777 /srv \
     # User
     && adduser --disabled-password --gecos "" docker \
@@ -44,10 +44,10 @@ RUN \
     && echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu {{ include "ubuntu_release" .Vars.system }} main" > /etc/apt/sources.list.d/ansible.list \
     && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367 \
     && apt-get update \
-    && apt-get install -y --no-install-recommends \
+    && apt-get install --yes --no-install-recommends \
         ansible
 
-COPY etc/ssh_config /etc/ssh/ssh_config
+COPY ../ssh/ssh_config /etc/ssh/ssh_config
 
 ENV \
     ANSIBLE_GATHER_SUBSET="all,!hardware" \
@@ -62,58 +62,90 @@ ENTRYPOINT ["/usr/local/bin/entrypoint"]
 
 WORKDIR /srv/app
 
-{{ if .Vars.system.php.version -}}
-{{- $php := .Vars.system.php -}}
+{{- if .Vars.system.php.version }}
+{{- $php := .Vars.system.php }}
+
 #######
 # Php #
 #######
 
 RUN \
-    echo "deb https://packages.sury.org/php/ {{ include "debian_release" .Vars.system }} main" > /etc/apt/sources.list.d/php.list \
-    && curl -sSL https://packages.sury.org/php/apt.gpg --output /etc/apt/trusted.gpg.d/php.gpg \
     # Disable irrelevants apt-key warnings
-    && export APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE="1" \
+    export APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE="1" \
     # Disable all debian user interaction
     && export DEBIAN_FRONTEND="noninteractive" \
+    && echo "deb https://packages.sury.org/php/ {{ include "debian_release" .Vars.system }} main" > /etc/apt/sources.list.d/php.list \
+    && curl --silent --location --show-error https://packages.sury.org/php/apt.gpg \
+        --output /etc/apt/trusted.gpg.d/php.gpg \
     && apt-get update \
-    && apt-get install -y --no-install-recommends \
+    && apt-get install --yes --no-install-recommends \
         php{{ $php.version }}-cli \
         {{- range $extension := $php.extensions }}
         php{{ $php.version }}-{{ $extension }} \
         {{- end }}
     # Composer
-    && apt-get install -y --no-install-recommends \
+    && apt-get install --yes --no-install-recommends \
         unzip \
-    && curl -sSL https://getcomposer.org/installer | php -- --install-dir /usr/local/bin --filename composer
+    && curl --silent --location --show-error https://getcomposer.org/installer \
+        | php -- --install-dir /usr/local/bin --filename composer
+
+{{- end }}
+
+{{- if .Vars.system.symfony.version }}
+{{- $symfony := .Vars.system.symfony }}
+
+###########
+# Symfony #
+###########
+
+RUN \
+    # Get latest version
+    VERSION=`curl --silent --location --fail https://get.symfony.com/cli/LATEST` \
+    && curl --silent --location --show-error https://github.com/symfony/cli/releases/download/v${VERSION}/symfony_linux_amd64.gz \
+        --output - | gunzip > /usr/local/bin/symfony \
+    && chmod +x /usr/local/bin/symfony
 
 {{- end }}
 
-{{ if .Vars.system.nodejs.version -}}
-{{- $nodejs := .Vars.system.nodejs -}}
+{{- if .Vars.system.nodejs.version }}
+{{- $nodejs := .Vars.system.nodejs }}
+
 ##########
 # NodeJs #
 ##########
 
 RUN \
-    echo "deb https://deb.nodesource.com/node_{{ $nodejs.version }}.x {{ include "debian_release" .Vars.system }} main" > /etc/apt/sources.list.d/node.list \
-    && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key \
-        | apt-key add - \
-    && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
-    && curl -sSL https://dl.yarnpkg.com/debian/pubkey.gpg \
-        | apt-key add - \
     # Disable irrelevants apt-key warnings
-    && export APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE="1" \
+    export APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE="1" \
     # Disable all debian user interaction
     && export DEBIAN_FRONTEND="noninteractive" \
+    && echo "deb https://deb.nodesource.com/node_{{ $nodejs.version }}.x {{ include "debian_release" .Vars.system }} main" > /etc/apt/sources.list.d/node.list \
+    && curl --silent --location --show-error https://deb.nodesource.com/gpgkey/nodesource.gpg.key \
+        | apt-key add - \
+    && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
+    && curl --silent --location --show-error https://dl.yarnpkg.com/debian/pubkey.gpg \
+        | apt-key add - \
     && apt-get update \
-    && apt-get install -y --no-install-recommends \
+    && apt-get install --yes --no-install-recommends \
         nodejs \
-        yarn
+        yarn \
+    && mkdir -p /usr/etc \
+    && echo "cache=\${XDG_CACHE_HOME}/npm" > /usr/etc/npmrc
+
+{{- end }}
 
+{{- if .Vars.system.apt.packages }}
+{{- $apt := .Vars.system.apt }}
+{{- $apt_packages := list }}
+{{- $apt_debs := list }}
+{{- range $package := $apt.packages }}
+    {{- if hasSuffix ".deb" $package }}
+      {{- $apt_debs = append $apt_debs $package }}
+    {{- else }}
+      {{- $apt_packages = append $apt_packages $package }}
+    {{- end }}
 {{- end }}
 
-{{ if .Vars.system.apt.packages -}}
-{{- $apt := .Vars.system.apt -}}
 #######
 # Apt #
 #######
@@ -122,10 +154,25 @@ RUN \
     # Disable irrelevants apt-key warnings
     export APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE="1" \
     # Disable all debian user interaction
-    && export DEBIAN_FRONTEND="noninteractive" \
-    && apt-get update \
-    && apt-get install -y --no-install-recommends \
-        {{ $apt.packages | join " " }}
+    && export DEBIAN_FRONTEND="noninteractive"
+
+    {{- if $apt_packages }} \
+    && apt-get install --yes --no-install-recommends \
+      {{- $apt_packages | join " \\\n" | nindent 8 }}
+    {{- end }}
+
+    {{- if $apt_debs }} \
+    && mkdir -p /tmp/_apt \
+    {{- $apt_package := "" }}
+    {{- range $deb := $apt_debs }}
+    {{- $apt_package = printf "%s/%s" "/tmp/_apt" (base $deb) }}
+    && curl --silent --location --show-error {{ $deb }} \
+        --output {{ $apt_package }} \
+    && dpkg --install --force-depends {{ $apt_package }} \
+    && apt-get install --yes --fix-broken \
+    {{- end }}
+    && rm -Rf /tmp/_apt
+    {{- end }}
 
 {{- end }}
 

elao.app/.manala/docker/bin/entrypoint.tmpl

@@ -8,10 +8,11 @@ if [ -n "${XDG_CACHE_HOME}" ]; then
     export HISTFILE="${XDG_CACHE_HOME}/.bash_history"
     # Ansible
     export ANSIBLE_CACHE_PLUGIN_CONNECTION="${XDG_CACHE_HOME}/ansible"
-    {{- if .Vars.system.nodejs.version }}
-    # Npm
-    export NPM_CONFIG_CACHE="${XDG_CACHE_HOME}/npm"
-    {{- end }}
+fi
+
+# Ssh authorization socket
+if [ -n "${SSH_AUTH_SOCK}" ]; then
+    sudo chmod 777 ${SSH_AUTH_SOCK}
 fi
 
 # Ssh key