Giuseppe Lavagetto has uploaded a new change for review. ( 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, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/75/379175/1 diff --git a/modules/profile/templates/docker/production-images-config.yaml.erb b/modules/profile/templates/docker/production-images-config.yaml.erb index c83718a..b961f71 100644 --- a/modules/profile/templates/docker/production-images-config.yaml.erb +++ b/modules/profile/templates/docker/production-images-config.yaml.erb @@ -1,3 +1,5 @@ +<%- if @proxy_host and @proxy_host != '' -%> +apt_options: "-o Acquire::http::Proxy::security.debian.org=<%= @proxy_host %>:<%= @proxy_port %> -o Acquire::http::Proxy::security-cdn.debian.org=<%= @proxy_host %>:<%= @proxy_port %>" 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: newchange Gerrit-Change-Id: I5a697620a3efc7fd2b24dd2119941748b8e5d5c8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
