Merge pull request #265 from noelmcloughlin/proxy

feat(proxy): allow setting env in systemd

Author: noelmcloughlin

docker/defaults.yaml

@@ -40,6 +40,7 @@ docker:
       name: docker-ce
       service:
         name: dockerd
+        env: null
       suffix: tgz
       commands:
         - docker

docker/files/default/systemd.ini.jinja

@@ -14,6 +14,7 @@ WorkingDirectory={{ workdir }}
 ExecStart={{ start }}
 ExecStop={{ stop }}
 PIDFile=/var/run/{{ name }}.pid
+Environment={{ '' if not env else env }}
 
 [Install]
 WantedBy=multi-user.target

docker/software/archive/install.sls

@@ -92,6 +92,7 @@
         user: {{ d.identity.rootuser }}
         group: {{ d.identity.rootgroup }}
         workdir: {{ d.dir.lib }}
+        env: {{ d.pkg.docker.service.env }}
         stop: ''
         start: {{ d.pkg.docker.path }}/{{ d.pkg.docker.service.name }}
   cmd.run:

pillar.example

@@ -8,6 +8,8 @@ docker:
 
   pkg:
     docker:
+      service:
+        env: HTTP_PROXY=http://YOUR_PROXY_IP_ADDRESS:PROXY_PORT
       environ:
         # yamllint disable-line rule:line-length
         - OPTIONS='-s devicemapper --storage-opt dm.fs=xfs --exec-opt native.cgroupdriver=cgroupfs --selinux-enabled'