Page MenuHomeDevCentral
Files F7136619

D2214.id5567.diff
No OneTemporary
Actions

D2214.id5567.diff
View Options

diff --git a/roles/paas-docker/docker/software.sls b/roles/paas-docker/docker/software.sls
--- a/roles/paas-docker/docker/software.sls
+++ b/roles/paas-docker/docker/software.sls
@@ -18,7 +18,7 @@
- docker-selinux
- docker-engine
-install_docker_engine:
+install_docker_engine_dependencies:
file.managed:
- name: /etc/yum.repos.d/docker-ce.repo
- source: https://download.docker.com/linux/centos/docker-ce.repo
@@ -27,9 +27,14 @@
- pkgs:
- device-mapper-persistent-data
- lvm2
- - docker-ce
- require:
- - file: install_docker_engine
+ - file: install_docker_engine_dependencies
+
+# CentOS 8 can't install docker-ce last version if containerd.io isn't recent enough.
+install_docker_engine:
+ cmd.run:
+ - name: dnf install -y docker-ce --nobest
+ - creates: /usr/bin/dockerd
{% endif %}
# -------------------------------------------------------------
diff --git a/roles/paas-docker/init.sls b/roles/paas-docker/init.sls
--- a/roles/paas-docker/init.sls
+++ b/roles/paas-docker/init.sls
@@ -6,12 +6,16 @@
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
+{% from "map.jinja" import dirs with context %}
+
include:
- .kernel
- .salt
- .docker
- .zemke-rhyne
+{% if salt['file.file_exists'](dirs['bin'] + '/zr') %}
- .containers
+{% endif %}
- .systemd-unit
- .wwwroot-502
- .nginx
diff --git a/roles/paas-docker/salt/init.sls b/roles/paas-docker/salt/init.sls
--- a/roles/paas-docker/salt/init.sls
+++ b/roles/paas-docker/salt/init.sls
@@ -6,11 +6,17 @@
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
+{% from "map.jinja" import packages_prefixes with context %}
+
# -------------------------------------------------------------
# Dependencies for Docker Salt minions
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
required_python_packages_for_docker_and_salt:
+ pkg.installed
+ - name: {{ packages_prefixes.python3 }}pip
pip.installed:
- name: docker
- bin_env: /usr/bin/pip3
+ - require:
+ - pkg: required_python_packages_for_docker_and_salt

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 22, 07:16 (18 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2594586
Default Alt Text
D2214.id5567.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator