compose: use proper dict syntax for use with anchors and extensions

Ouranosinc · Oct 8, 2024 · 7280061 · 7280061
1 parent e57a459
commit 7280061
Showing 1 changed file with 19 additions and 19 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,7 +8,7 @@ x-common-env: &common-env
   # For error "process apparently never started in
   # /home/jenkins/agent/workspace/_workflow-tests_new-docker-build@tmp/durable-12eaff4f"
   # on RockyLinux9 (RL8 was fine)
-  - JAVA_OPTS= -Dorg.jenkinsci.plugins.durabletask.BourneShellScript.LAUNCH_DIAGNOSTICS=true
+  JAVA_OPTS: -Dorg.jenkinsci.plugins.durabletask.BourneShellScript.LAUNCH_DIAGNOSTICS=true
 
 
 services:
@@ -21,22 +21,22 @@ services:
       - master_home:/var/jenkins_home
       - ./buildout/jcasc_config:/jcasc:ro
     environment:
-      - CASC_JENKINS_CONFIG=/jcasc/
-      - SSH_PRIVATE_KEY=${SSH_PRIVATE_KEY}
-      - ADMIN_PASSWD=$JENKINS_ADMIN_PASSWD
-      - HTTP_PROTO=$JENKINS_HTTP_PROTO
-      - HOSTNAME=$JENKINS_HOSTNAME
-      - HOSTPORT=$JENKINS_MASTER_PORT
-      - NUM_EXECUTORS=$JENKINS_NUM_EXECUTORS_LOCAL
-      - ESGF_AUTH_USERNAME=$JENKINS_ESGF_AUTH_USERNAME
-      - ESGF_AUTH_PASSWORD=$JENKINS_ESGF_AUTH_PASSWORD
-      - ESGF_AUTH_TOKEN=$JENKINS_ESGF_AUTH_TOKEN
-      - HYDROSHARE_AUTH_CLIENT_ID=$JENKINS_HYDROSHARE_AUTH_CLIENT_ID
-      - HYDROSHARE_AUTH_TOKEN=$JENKINS_HYDROSHARE_AUTH_TOKEN
-      - IS_PROD=$JENKINS_IS_PROD
-      - ENABLE_SCHEDULED_TRIGGER=$JENKINS_ENABLE_SCHEDULED_TRIGGER
-      - DEFAULT_PAVICS_HOST=$JENKINS_DEFAULT_PAVICS_HOST
-      - SMTP_HOST=$JENKINS_SMTP_HOST
+      CASC_JENKINS_CONFIG: /jcasc/
+      SSH_PRIVATE_KEY: ${SSH_PRIVATE_KEY}
+      ADMIN_PASSWD: $JENKINS_ADMIN_PASSWD
+      HTTP_PROTO: $JENKINS_HTTP_PROTO
+      HOSTNAME: $JENKINS_HOSTNAME
+      HOSTPORT: $JENKINS_MASTER_PORT
+      NUM_EXECUTORS: $JENKINS_NUM_EXECUTORS_LOCAL
+      ESGF_AUTH_USERNAME: $JENKINS_ESGF_AUTH_USERNAME
+      ESGF_AUTH_PASSWORD: $JENKINS_ESGF_AUTH_PASSWORD
+      ESGF_AUTH_TOKEN: $JENKINS_ESGF_AUTH_TOKEN
+      HYDROSHARE_AUTH_CLIENT_ID: $JENKINS_HYDROSHARE_AUTH_CLIENT_ID
+      HYDROSHARE_AUTH_TOKEN: $JENKINS_HYDROSHARE_AUTH_TOKEN
+      IS_PROD: $JENKINS_IS_PROD
+      ENABLE_SCHEDULED_TRIGGER: $JENKINS_ENABLE_SCHEDULED_TRIGGER
+      DEFAULT_PAVICS_HOST: $JENKINS_DEFAULT_PAVICS_HOST
+      SMTP_HOST: $JENKINS_SMTP_HOST
       <<: *common-env
     links:
       - slave
@@ -52,8 +52,8 @@ services:
       - ./jenkins-slave/entrypoint_slave:/entrypoint:ro
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
-      - JENKINS_SLAVE_SSH_PUBKEY=$JENKINS_SLAVE_SSH_PUBKEY
-      - DOCKER_GROUP_ON_HOST=$DOCKER_GROUP_ON_HOST
+      JENKINS_SLAVE_SSH_PUBKEY: $JENKINS_SLAVE_SSH_PUBKEY
+      DOCKER_GROUP_ON_HOST: $DOCKER_GROUP_ON_HOST
       <<: *common-env
     restart: always
     logging: