Rearrange Jenkins Agent Environment Variables

Moves the public key into config.env, and JAVA_OPTS into
docker-compose.yml since other containers look for the JAVA_OPTS
variable and it contains Jenkins specific information.

Change-Id: I775ac6fee8fdf3ec318368be973c43e8925d0fe5
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>

diff --git a/config.env b/config.env
index 1e085e9..d36f127 100644 (file)
--- a/config.env
+++ b/config.env
@@ -24,10 +24,11 @@ LDAP_LOCALUSERNAMETOLOWERCASE=true
 ##
 # Jenkins
 ##
-JAVA_OPTS="-Djenkins.install.runSetupWizard=false"
 JENKINS_OPTS=""
 JENKINS_ADMIN_USER=admin
 JENKINS_ADMIN_PASSWORD=password
+# This is hardcoded due to jenkinsci/ssh-slave not accepting a file...
+JENKINS_SLAVE_SSH_PUBKEY=ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUX11sDBXacCE/LBdcXO4E27OZbWtjNadXPGIRTN1leUFWJlnljlZT31Wbml8fvp+5BKbVRHP/W9IWj/PlBTxrxOPMN2Rch40tarPU1PxWJYM203n6Ac+GWKcfSPiikmfXiJ+pJHs+0E1MVhpLe08pb3qVdvwAGdQXVC53dg9ebrb5KirbLvWdEMewfVlxdB2ru2p358QN5Y7HHsAqW1sMr18G1/O5bVJl7g1JbnQ+/YjVaJRo7cDuonTOeatlEMfZZXzlermgXCcVFSIo/oKuKbtilZ2ye17ax9kN4rfVAAXIeOAUZWeCad32EdQEO7xL956ZftXyV+jlw03CndD5
 
 ##
 # Postgres

diff --git a/docker-compose.yml b/docker-compose.yml
index c893129..71cc51a 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,6 +28,7 @@ services:
         container_name: releng-jenkins
         env_file: config.env
         environment:
+            - JAVA_OPTS="-Djenkins.install.runSetupWizard=false"
             - VIRTUAL_HOST=jenkins.localhost
             - VIRTUAL_PORT=8080
         volumes:
@@ -44,10 +45,9 @@ services:
     jenkins-agent:
         build: ./jenkins/agent
         container_name: releng-agent
+        env_file: config.env
         ports:
             - "22"
-        environment:
-            - JENKINS_SLAVE_SSH_PUBKEY=ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUX11sDBXacCE/LBdcXO4E27OZbWtjNadXPGIRTN1leUFWJlnljlZT31Wbml8fvp+5BKbVRHP/W9IWj/PlBTxrxOPMN2Rch40tarPU1PxWJYM203n6Ac+GWKcfSPiikmfXiJ+pJHs+0E1MVhpLe08pb3qVdvwAGdQXVC53dg9ebrb5KirbLvWdEMewfVlxdB2ru2p358QN5Y7HHsAqW1sMr18G1/O5bVJl7g1JbnQ+/YjVaJRo7cDuonTOeatlEMfZZXzlermgXCcVFSIo/oKuKbtilZ2ye17ax9kN4rfVAAXIeOAUZWeCad32EdQEO7xL956ZftXyV+jlw03CndD5
     gerrit:
         image: "openfrontier/gerrit:$GERRIT_CONTAINER_VERSION"
         container_name: releng-gerrit