Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330207 )
Change subject: profile::docker::builder: add alpine linux
......................................................................
profile::docker::builder: add alpine linux
Also, adapt the coding to our own coding standards.
Change-Id: I82dc465018184d558a12864fd9a150b4782cd100
---
M modules/profile/manifests/docker/builder.pp
1 file changed, 20 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/07/330207/1
diff --git a/modules/profile/manifests/docker/builder.pp
b/modules/profile/manifests/docker/builder.pp
index 85ae87f..1d68af2 100644
--- a/modules/profile/manifests/docker/builder.pp
+++ b/modules/profile/manifests/docker/builder.pp
@@ -1,16 +1,31 @@
-class profile::docker::builder {
- $proxy_address = hiera('profile::docker::builder::proxy_address')
- $proxy_port = hiera('profile::docker::builder::proxy_port')
+# == Class profile::docker::builder
+#
+# This class sets up a docker builder server, where our base images can be
built
+# and uploaded to the docker registry.
+#
+# === Parameters
+#
+# [*proxy_address*] The http proxy address, set to undef if you don't want to
use item
+#
+# [*proxy_port*] The http proxy port; set to undef if not needed
+#
+# [*registry*] Address of the docker registry.
+#
+class profile::docker::builder(
+ $proxy_address = hiera('profile::docker::builder::proxy_address'),
+ $proxy_port = hiera('profile::docker::builder::proxy_port'),
+ $registry = hiera('docker::registry'),
+ ) {
system::role { 'role::docker::builder':
description => 'Docker images builder'
}
class { 'docker::baseimages':
- docker_registry => hiera('docker::registry'),
+ docker_registry =>
proxy_address => $proxy_address,
proxy_port => $proxy_port,
- distributions => ['jessie'],
+ distributions => ['jessie', 'alpine'],
}
# TODO: create a repo for base images in prod for this
--
To view, visit https://gerrit.wikimedia.org/r/330207
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I82dc465018184d558a12864fd9a150b4782cd100
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
