Merge changes from topic 'docker-build'

* changes:
  [docker build] Install OpenSSH server
  [submodule] Add docker-salt-formulas, ci/build.sh
  [deploy.sh] Install Docker if not present
  [jump req] Add build/deploy specific requirements

3 files changed, 25 insertions, 3 deletions

diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index c566cc993..5f1275dc5 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -321,6 +321,7 @@ function prepare_vms {
 }
 
 function jumpserver_pkg_install {
+  local req_type=$1
   if [ -n "$(command -v apt-get)" ]; then
     pkg_type='deb'; pkg_cmd='sudo apt-get install -y'
   else
@@ -328,7 +329,7 @@ function jumpserver_pkg_install {
   fi
   eval "$(parse_yaml "./requirements_${pkg_type}.yaml")"
   for section in 'common' "$(uname -i)"; do
-    section_var="requirements_pkg_${section}[*]"
+    section_var="${req_type}_${section}[*]"
     pkg_list+=" ${!section_var}"
   done
   # shellcheck disable=SC2086
@@ -571,3 +572,14 @@ function get_nova_compute_pillar_data {
     echo "${value}"
   fi
 }
+
+function docker_install {
+  # Mininum effort attempt at installing Docker if missing
+  if ! which docker; then
+    curl -fsSL https://get.docker.com -o get-docker.sh
+    sudo sh get-docker.sh
+    rm get-docker.sh
+    # On RHEL distros, the Docker service should be explicitly started
+    sudo systemctl start docker
+  fi
+}
diff --git a/mcp/scripts/requirements_deb.yaml b/mcp/scripts/requirements_deb.yaml
index 04ddcf631..c04f2a1d7 100644
--- a/mcp/scripts/requirements_deb.yaml
+++ b/mcp/scripts/requirements_deb.yaml
@@ -6,13 +6,18 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 ---
-requirements_pkg:
+build:
+  # Common pkgs required for all builds, no matter the type, arch etc.
+  common:
+    - python-pip
+deploy:
   # Common pkgs required for all deploys, no matter the type, arch etc.
   common:
     - bridge-utils
     - cloud-guest-utils
     - cpu-checker
     - curl
+    - docker-compose
     - e2fsprogs
     - git
     - kpartx
diff --git a/mcp/scripts/requirements_rpm.yaml b/mcp/scripts/requirements_rpm.yaml
index 3df4d0a80..50ce5d9f5 100644
--- a/mcp/scripts/requirements_rpm.yaml
+++ b/mcp/scripts/requirements_rpm.yaml
@@ -6,13 +6,18 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 ---
-requirements_pkg:
+build:
+  # Common pkgs required for all builds, no matter the type, arch etc.
+  common:
+    - python-pip
+deploy:
   # Common pkgs required for all deploys, no matter the type, arch etc.
   common:
     - bc
     - bridge-utils
     - cloud-utils-growpart
     - curl
+    - docker-compose
     - elfutils-libelf-devel
     - e2fsprogs
     - genisoimage