Muehlenhoff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/352545 )
Change subject: Fix proxy configuration for docker image build
......................................................................
Fix proxy configuration for docker image build
The currently used docker-engine package ships a service unit which
hardcodes the proxy setting. This breaks uploads to our docker registry.
Ship a systemd override to remove it.
Change-Id: If3c9d84773099a890530aed0131d90dbb4b4fbb5
---
A modules/docker/fix-proxy.conf
M modules/profile/manifests/docker/engine.pp
2 files changed, 18 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/45/352545/1
diff --git a/modules/docker/fix-proxy.conf b/modules/docker/fix-proxy.conf
new file mode 100644
index 0000000..b1408fb
--- /dev/null
+++ b/modules/docker/fix-proxy.conf
@@ -0,0 +1,2 @@
+[Service]
+Environment=
diff --git a/modules/profile/manifests/docker/engine.pp
b/modules/profile/manifests/docker/engine.pp
index 543ea8a..4f539a2 100644
--- a/modules/profile/manifests/docker/engine.pp
+++ b/modules/profile/manifests/docker/engine.pp
@@ -51,4 +51,20 @@
ensure => 'running',
}
}
+
+ file { '/etc/systemd/system/docker.service.d':
+ ensure => directory,
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ before => File['/etc/systemd/system/docker.service.d/'],
+ }
+
+ file { '/etc/systemd/system/docker.service.d/fix-proxy.conf':
+ ensure => present,
+ source => 'puppet:///modules/docker/fix-proxy.conf',
+ mode => '0444'
+ owner => 'root',
+ group => 'root',
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/352545
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If3c9d84773099a890530aed0131d90dbb4b4fbb5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
