From e00e31b589a2a1e5d21fe20d33a5890154c9242f Mon Sep 17 00:00:00 2001
From: Nicholas Mucks <urbanrobots@yahoo.com>
Date: Sun, 28 Jul 2024 19:09:34 -0700
Subject: [PATCH] change order of servers to follow build pipeline

---
 docker-compose_spring-petclinic.yml | 41 +++++++++++++++--------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/docker-compose_spring-petclinic.yml b/docker-compose_spring-petclinic.yml
index 6532bad47..6417e3502 100644
--- a/docker-compose_spring-petclinic.yml
+++ b/docker-compose_spring-petclinic.yml
@@ -10,6 +10,27 @@ services:
     networks:
       - custom-network
 
+
+  jenkins:
+    build:
+      context: .
+      dockerfile: Dockerfile.jenkins
+    image: my-jenkins:latest
+    ports:
+      - "8081:8080"
+      - "50000:50000"
+    privileged: true
+    user: root
+    environment:
+      - JAVA_OPTS=-Djenkins.install.runSetupWizard=false
+      - CASC_JENKINS_CONFIG=/var/jenkins_home/casc_configs/jenkins.yaml
+    volumes:
+      - ./jenkins_data:/var/jenkins_home
+      - ./jenkins.yaml:/var/jenkins_home/casc_configs/jenkins.yaml
+      - /var/run/docker.sock:/var/run/docker.sock
+    networks:
+      - custom-network
+
   prometheus:
     image: prom/prometheus:latest
     ports:
@@ -36,26 +57,6 @@ services:
       - prometheus
 
 
-  jenkins:
-    build:
-      context: .
-      dockerfile: Dockerfile.jenkins
-    image: my-jenkins:latest
-    ports:
-      - "8081:8080"
-      - "50000:50000"
-    privileged: true
-    user: root
-    environment:
-      - JAVA_OPTS=-Djenkins.install.runSetupWizard=false
-      - CASC_JENKINS_CONFIG=/var/jenkins_home/casc_configs/jenkins.yaml
-    volumes:
-      - ./jenkins_data:/var/jenkins_home
-      - ./jenkins.yaml:/var/jenkins_home/casc_configs/jenkins.yaml
-      - /var/run/docker.sock:/var/run/docker.sock
-    networks:
-      - custom-network
-
   zap:
     image: ghcr.io/zaproxy/zaproxy:stable
     command: zap-baseline.py -t http://petclinic:8080 -g gen.conf -r zap-report.html