commit e7d4f8680f12ea88d22ebb8846af4b7d23f7f57a
author Filip Pytloun <filip@pytloun.cz> Fri Aug 04 13:11:51 2017 +0200
committer Jiri Broulik <jbroulik@mirantis.com> Wed Sep 20 15:37:53 2017 +0200
tree b0016416d971a33211c4858781b473f18fda7dab
parent 47799ad0ed461bab154a3010a01689a0fb002b72

Allow passing extra java opts and proxy env

Change-Id: I4b0350c24ff461a9c08c71ee587dd08570ce2929

docker/swarm/stack/gerrit.yml

diff --git a/docker/swarm/stack/gerrit.yml b/docker/swarm/stack/gerrit.yml
index 95bc233..49d0a11 100644
--- a/docker/swarm/stack/gerrit.yml
+++ b/docker/swarm/stack/gerrit.yml
@@ -1,3 +1,5 @@
+classes:
+- system.docker
 parameters:
   _param:
     docker_image_gerrit: tcpcloud/gerrit:2.13.6
@@ -8,6 +10,7 @@
     gerrit_ldap_account_base: ""
     gerrit_ldap_group_base: ""
     gerrit_http_listen_url: http://*:8080/
+    gerrit_extra_opts: ""
   docker:
     client:
       stack:
@@ -45,6 +48,10 @@
                 GERRIT_ADMIN_PWD: ${_param:gerrit_admin_password}
                 GERRIT_ADMIN_EMAIL: ${_param:gerrit_admin_email}
                 CANLOADINIFRAME: "true"
+                JAVA_OPTIONS: ${_param:gerrit_extra_opts}
+                https_proxy: ${_param:docker_https_proxy}
+                http_proxy: ${_param:docker_http_proxy}
+                no_proxy: ${_param:docker_no_proxy}
             db:
               environment:
                 MYSQL_USER: gerrit