Browse Source

Merge pull request #4214 from giuseppe/rename-ENIRONMENT-to-Environment

Merged by openshift-bot
OpenShift Bot 8 years ago
parent
commit
6009c370ae
1 changed files with 3 additions and 3 deletions
  1. 3 3
      roles/docker/templates/systemcontainercustom.conf.j2

+ 3 - 3
roles/docker/templates/systemcontainercustom.conf.j2

@@ -2,13 +2,13 @@
 
 [Service]
 {% if "http_proxy" in openshift.common %}
-ENVIRONMENT=HTTP_PROXY={{ docker_http_proxy }}
+Environment=HTTP_PROXY={{ docker_http_proxy }}
 {% endif -%}
 {% if "https_proxy" in openshift.common %}
-ENVIRONMENT=HTTPS_PROXY={{ docker_http_proxy }}
+Environment=HTTPS_PROXY={{ docker_http_proxy }}
 {% endif -%}
 {% if "no_proxy" in openshift.common %}
-ENVIRONMENT=NO_PROXY={{ docker_no_proxy }}
+Environment=NO_PROXY={{ docker_no_proxy }}
 {% endif %}
 {%- if os_firewall_use_firewalld|default(false) %}
 [Unit]