Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/379175 )
Change subject: profile::docker::builder: add proxy settings to build config ...................................................................... profile::docker::builder: add proxy settings to build config Change-Id: I5a697620a3efc7fd2b24dd2119941748b8e5d5c8 --- M modules/profile/templates/docker/production-images-config.yaml.erb 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/profile/templates/docker/production-images-config.yaml.erb b/modules/profile/templates/docker/production-images-config.yaml.erb index c83718a..57a4f08 100644 --- a/modules/profile/templates/docker/production-images-config.yaml.erb +++ b/modules/profile/templates/docker/production-images-config.yaml.erb @@ -1,3 +1,6 @@ +<%- if @proxy_address and @proxy_address != '' -%> +http_proxy: "http://<%= @proxy_address %>:<%= @proxy_port %>" +<%- end -%> registry: <%= @registry %> username: <%= @username %> password: <%= @password %> -- To view, visit https://gerrit.wikimedia.org/r/379175 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5a697620a3efc7fd2b24dd2119941748b8e5d5c8 Gerrit-PatchSet: 6 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: Alexandros Kosiaris <[email protected]> Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
