Rd 873 update repo sources

.kitchen.yml

@@ -6,32 +6,71 @@ driver:
 
 provisioner:
   name: salt_solo
-  log_level: debug
+  log_level: warning
   require_chef: false
   formula: docker
   state_top:
     base:
       '*':
+        - docker.remove
         - docker
+  pillars:
+    top.sls:
+      base:
+        '*':
+          - docker
 
 platforms:
-  - name: ubuntu-14.04
+  - name: ubuntu-18.04
+    driver_config:
+      provision_command:
+        - apt-get update && apt-get install -y locales ifupdown
+        - locale-gen en_US.UTF-8
+        - update-locale LANG=en_US.UTF-8
+        - mkdir -p /run/sshd
+      run_command: /lib/systemd/systemd
+  - name: debian-stretch
+    driver_config:
+      provision_command:
+        - apt-get update && apt-get install -y locales ifupdown
+        - locale-gen en_US.UTF-8
+      run_command: /lib/systemd/systemd
   - name: debian-jessie
     driver_config:
-      run_command: /sbin/init
+      provision_command:
+        - apt-get update && apt-get install -y locales ifupdown
+        - locale-gen en_US.UTF-8
+      run_command: /lib/systemd/systemd
+#   - name: centos-7
+#     driver_config:
+#       run_command: /lib/systemd/systemd
 
 suites:
   - name: default
-  - name: version-1.12.2
     provisioner:
       pillars:
-        top.sls:
-          base:
-            '*':
-              - docker
         docker.sls:
           docker:
-            version: '1.12.2*'
+            use_upstream_repo: true
+  - name: version-1.13.1
+    provisioner:
+      pillars:
+        docker.sls:
+          docker:
+            version: '1.13.1*'
+            use_old_repo: true
+    excludes:
+      - ubuntu-18.04
+  - name: version-18
+    provisioner:
+      pillars:
+        docker.sls:
+          docker:
+            version: '18.*'
+            use_old_repo: true
+    excludes:
+      - debian-stretch
+      - debian-jessie
 
 verifier:
   name: shell

.travis.yml

@@ -1,12 +1,22 @@
 sudo: required
 
 
-language: ruby
+language: python
 
 services:
   - docker
 
 before_install:
-  - pip install -r requirements.txt
+  - bundle install
 
-script: bundle exec kitchen verify
+
+env:
+  matrix:
+    - INSTANCE: default-ubuntu-1804
+    - INSTANCE: default-debian-jessie
+    - INSTANCE: default-debian-stretch
+    - INSTANCE: version-1131-debian-jessie
+    - INSTANCE: version-1131-debian-stretch
+
+script:
+  - bundle exec kitchen verify ${INSTANCE}

README.rst

@@ -51,6 +51,9 @@ To use it, just include *docker.containers* in your *top.sls*, and configure it
           - "--rm"
       myapp:
         image: "myregistry.com:5000/training/app:3.0"
+	args:
+          - "https://someargument_as_an_url"
+          - "--port 5500"
         cmd:  python app.py
         runoptions:
           - "--log-driver=syslog"
@@ -67,13 +70,18 @@ In the example pillar above:
 - Upstart files are created for each container, so ``service <container_name> stop|start|status`` should just work
 - ``service <container_name> stop`` will wipeout the container completely (ie ``docker stop <container_name> + docker rm <container_name>``)
 
+``docker.repo``
+---------------
+
+Configures the upstream docker's repo (true, by default).
+
 
 ``docker.compose``
 ------------------
 
-Add support for using `Docker Compose <https://docs.docker.com/compose/>`_
+Installs `Docker Compose <https://docs.docker.com/compose/>`_
 (previously ``fig``) to define groups of containers and their relationships
-with one another.
+with one another. Use `docker.compose-ng` to run `docker-compose`.
 
 ``docker.compose-ng``
 ---------------------
@@ -178,6 +186,16 @@ In this case, extra *docker run* options can be provided in your *"registry:look
 
 By default, the storage backend used by the registry is "filesystem". Use environment variables to override that, for example to use S3 as backend storage.
 
+``docker.remove``
+----------------
+
+Stop Docker daemon. Remove older docker packages (usually called 'docker' and 'docker-engine').
+
+Development
+===========
+
+Note that some of the internal states such as `docker.running` are references to the internal `dockerio states <https://docs.saltstack.com/en/latest/ref/states/all/salt.states.dockerio.html>`
+
 
 Testing
 =======
@@ -198,4 +216,3 @@ Requirements
     gem install bundler
     bundle install
     kitchen test
-

docker/codenamemap.yaml

@@ -20,9 +20,15 @@ jessie:
       humanname: Jessie Backports
       dist: jessie-backports
 
+trusty:
+  kernel:
+    pkgs:
+      - linux-image-extra-virtual
+      - linux-image-extra-{{ grains.kernelrelease }}
+
 precise:
   kernel:
-    pkg:
-      pkgs:
-        - linux-image-generic-lts-raring
-        - linux-headers-generic-lts-raring
+    pkgs:
+      - linux-image-generic-lts-raring
+      - linux-headers-generic-lts-raring
+

docker/compose-ng.sls

@@ -1,9 +1,20 @@
+{%- from "docker/map.jinja" import docker with context %}
 {%- from "docker/map.jinja" import compose with context %}
+
+include:
+  - docker.compose
+
 {%- for name, container in compose.items() %}
   {%- set id = container.container_name|d(name) %}
   {%- set required_containers = [] %}
+    {%- if grains['saltversioninfo'] >= [2017, 7, 0]  %}
+{{id}}:
+  docker_image.present:
+    - force: {{ docker.containers.force_present }}
+    {%- else %}
 {{id}} image:
   docker.pulled:
+    {%- endif %}
   {%- if ':' in container.image %}
     {%- set image = container.image.split(':',1) %}
     - name: {{image[0]}}
@@ -13,19 +24,25 @@
   {%- endif %}
 
 {{id}} container:
-  {%- if 'dvc' in container and container.dvc %}
+     {%- if grains['saltversioninfo'] >= [2017, 7, 0] %}
+  docker_container.running:
+    - skip_translate: {{ docker.containers.skip_translate }}
+    - force: {{ docker.containers.force_running }}
+     {%- else %}
+       {%- if 'dvc' in container and container.dvc %}
   docker.installed:
-  {%- else %}
+       {%- else %}
   docker.running:
-  {%- endif %}
+       {%- endif %}
+     {%- endif %}
     - name: {{id}}
     - image: {{container.image}}
   {%- if 'command' in container %}
     - command: {{container.command}}
   {%- endif %}
   {%- if 'environment' in container and container.environment is iterable %}
     - environment:
-    {%- for variable, value in container.environment.iteritems() %}
+    {%- for variable, value in container.environment.items() %}
         - {{variable}}: {{value}}
     {%- endfor %}
   {%- endif %}
@@ -76,10 +93,18 @@
     {%- endif %}
   {%- endif %}
     - require:
+         {%- if grains['saltversioninfo'] >= [2017, 7, 0] %}
+      - docker_image: {{id}}
+         {%- else %}
       - docker: {{id}} image
+         {%- endif %}
   {%- if required_containers is defined %}
     {%- for containerid in required_containers %}
+         {%- if grains['saltversioninfo'] >= [2017, 7, 0] %}
+      - docker_image: {{containerid}}
+         {%- else %}
       - docker: {{containerid}}
+         {%- endif %}
     {%- endfor %}
   {%- endif %}
 {% endfor %}

docker/compose.sls

@@ -1,16 +1,21 @@
-{% from "docker/map.jinja" import compose with context %}
+{% from "docker/map.jinja" import docker with context %}
 
-compose-pip:
+include:
+  - docker
+
+docker-compose-pip:
   pkg.installed:
-    - name: python-pip
-  pip.installed:
-    - name: pip
-    - upgrade: True
+    - name: {{ docker.pip.pkgname }}
+    - require_in:
+      - pip: docker-compose
 
-compose:
+docker-compose:
   pip.installed:
-    {%- if "version" in compose %}
-    - name: docker-compose == {{ compose.version }}
+    {%- if docker.compose_version %}
+    - name: docker-compose == {{ docker.compose_version }}
     {%- else %}
     - name: docker-compose
     {%- endif %}
+    {%- if docker.proxy %}
+    - proxy: {{ docker.proxy }}
+    {%- endif %}

docker/containers.sls

@@ -25,7 +25,8 @@ docker-image-{{ name }}-retry:
       - cmd: docker-image-{{ name }}
 
 {# TODO: SysV init script #}
-{%- set init_system = salt["cmd.run"]("bash -c 'ps -p1 | grep -q systemd && echo systemd || echo upstart'") %}
+{# Use grains instead of command to get init system #}
+{%- set init_system = grains['init'] %}
 
 docker-container-startup-config-{{ name }}:
   file.managed:
@@ -34,11 +35,10 @@ docker-container-startup-config-{{ name }}:
     - source: salt://docker/files/systemd_processor.conf
 {%- elif init_system == "systemd" %}
     - name: /etc/systemd/system/docker-{{ name }}.service
-    - source: salt://docker/files/systemd.conf
 {%- elif init_system == "upstart" %}
     - name: /etc/init/docker-{{ name }}.conf
-    - source: salt://docker/files/upstart.conf
 {%- endif %}
+    - source: salt://docker/files/service_file.jinja
     - mode: 700
     - user: root
     - template: jinja

docker/defaults.yaml

@@ -2,7 +2,38 @@
 
 docker:
   process_signature: '/usr/bin/docker'
-  python_pip_package: 'python-pip'
   install_docker_py: False
   refresh_repo: True
+  configfile: /etc/default/docker
   config: []
+
+  use_upstream_repo: True
+  use_old_repo: False
+  proxy: False
+
+  # Repo parameters are set in docker/osfamilymap.yaml
+
+  pkg:
+    name: docker-ce
+    old_name: docker-engine
+    # For backward compatibility, this will be overriden by
+    # docker:version, if defined
+    version: latest
+    allow_updates: False
+    hold: False
+
+  pip:
+    pkgname: python-pip
+    upgrade: False
+
+  compose_version:
+
+  containers:
+    skip_translate: None
+    force_present: False
+    force_running: False
+
+  kernel:
+    pkg:
+      fromrepo: '' 
+    pkgs: []

docker/files/service_file.jinja

@@ -0,0 +1,19 @@
+{#- Ugly, but covers the cases where variable evaluates to false, is empty, or non-existent #}
+{%- set runoptions = container.get("runoptions") or [] %}
+{%- set stopoptions = container.get("stopoptions") or [] %}
+{%- set cmd = container.get("cmd") or "" %}
+{%- set args = container.get("args") or [] %}
+
+{%- set runoptions = runoptions|join(' ') %}
+{%- set stopoptions = stopoptions|join(' ') %}
+{%- set args = args|join(' ') %}
+
+{%- set docker_start_command = "run %s --name=%s %s %s %s"|format(runoptions, name, container.image, cmd, args)  %}
+{%- set docker_stop_command = "stop %s %s"|format(stopoptions, name) %}
+{%- set docker_poststop_command = "rm -f %s"|format(name) %}
+
+{%- if grains['init'] == 'systemd' %}
+{%- include 'docker/files/systemd.conf' %}
+{%- elif grains['init'] == 'upstart' %}
+{%- include 'docker/files/upstart.conf' %}
+{%- endif %}