From dce112a769461411c5061a0cead7491e52a4d8d6 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 17 Oct 2019 00:13:10 +0100 Subject: [PATCH] fix(pillar.example): ensure `docker.config` is available --- pillar.example | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pillar.example b/pillar.example index f253e82a..6dd30c2b 100644 --- a/pillar.example +++ b/pillar.example @@ -51,11 +51,6 @@ docker-pkg: lookup: process_signature: /usr/bin/docker - # config for sysvinit/upstart (for systemd, use drop-ins in your own states) - config: - - DOCKER_OPTS="-s btrfs --dns 8.8.8.8" - - export http_proxy="http://172.17.42.1:3128" - # Docker compose supported attributes docker: # install_pypi_pip: true @@ -82,6 +77,11 @@ docker: # allow_updates: true use_upstream_app: false + # config for sysvinit/upstart (for systemd, use drop-ins in your own states) + config: + - DOCKER_OPTS="-s btrfs --dns 8.8.8.8" + - export http_proxy="http://172.17.42.1:3128" + # PIP proxy configuration (defaults to false) # proxy: proxy.com:3128