Fix docker username

Jenkinsfile

@@ -0,0 +1,238 @@
+pipeline {
+
+  agent none
+
+  stages {
+
+    stage('worker-build') {
+      agent {
+        docker {
+          image 'maven:3.9.8-sapmachine-21'
+          args '-v $HOME/.m2:/root/.m2'
+        }
+
+      }
+      when {
+        changeset '**/worker/**'
+      }
+      steps {
+        echo 'Compiling worker app..'
+        dir(path: 'worker') {
+          sh 'mvn compile'
+        }
+
+      }
+    }
+
+    stage('worker test') {
+      agent {
+        docker {
+          image 'maven:3.9.8-sapmachine-21'
+          args '-v $HOME/.m2:/root/.m2'
+        }
+
+      }
+      when {
+        changeset '**/worker/**'
+      }
+      steps {
+        echo 'Running Unit Tets on worker app.'
+        dir(path: 'worker') {
+          sh 'mvn clean test'
+        }
+
+      }
+    }
+
+    stage('worker-package') {
+      agent {
+        docker {
+          image 'maven:3.9.8-sapmachine-21'
+          args '-v $HOME/.m2:/root/.m2'
+        }
+
+      }
+      when {
+        branch 'master'
+        changeset '**/worker/**'
+      }
+      steps {
+        echo 'Packaging worker app'
+        dir(path: 'worker') {
+          sh 'mvn package -DskipTests'
+          archiveArtifacts(artifacts: '**/target/*.jar', fingerprint: true)
+        }
+
+      }
+    }
+
+    stage('worker-docker-package') {
+      agent any
+      when {
+        changeset '**/worker/**'
+        branch 'master'
+      }
+      steps {
+        echo 'Packaging worker app with docker'
+        script {
+          docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin') {
+            def workerImage = docker.build("norahns/worker:v${env.BUILD_ID}", './worker')
+            workerImage.push()
+            workerImage.push("${env.BRANCH_NAME}")
+            workerImage.push('latest')
+          }
+        }
+
+      }
+    }
+
+    stage('result-build') {
+      agent {
+        docker {
+          image 'node:22.4.0-alpine'
+        }
+
+      }
+      when {
+        changeset '**/result/**'
+      }
+      steps {
+        echo 'Compiling result app..'
+        dir(path: 'result') {
+          sh 'npm install'
+        }
+
+      }
+    }
+
+    stage('result-test') {
+      agent {
+        docker {
+          image 'node:22.4.0-alpine'
+        }
+
+      }
+      when {
+        changeset '**/result/**'
+      }
+      steps {
+        echo 'Running Unit Tests on result app..'
+        dir(path: 'result') {
+          sh 'npm install'
+          sh 'npm test'
+        }
+
+      }
+    }
+
+    stage('result-docker-package') {
+      agent any
+      when {
+        changeset '**/result/**'
+        branch 'master'
+      }
+      steps {
+        echo 'Packaging result app with docker'
+        script {
+          docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin') {
+            def resultImage = docker.build("norahns/result:v${env.BUILD_ID}", './result')
+            resultImage.push()
+            resultImage.push("${env.BRANCH_NAME}")
+            resultImage.push('latest')
+          }
+        }
+      }
+    }
+
+    stage('vote-build') {
+      agent {
+        docker {
+          image 'python:3.11-slim'
+          args '--user root'
+        }
+
+      }
+      when {
+        changeset '**/vote/**'
+      }
+      steps {
+        echo 'Compiling vote app.'
+        dir(path: 'vote') {
+          sh 'pip install -r requirements.txt'
+        }
+
+      }
+    }
+
+    stage('vote-test') {
+      agent {
+        docker {
+          image 'python:3.11-slim'
+          args '--user root'
+        }
+
+      }
+      when {
+        changeset '**/vote/**'
+      }
+      steps {
+        echo 'Running Unit Tests on vote app.'
+        dir(path: 'vote') {
+          sh 'pip install -r requirements.txt'
+          sh 'nosetests -v'
+        }
+
+      }
+    }
+
+    stage('vote-integration') {
+      agent any
+      when {
+      changeset '**/vote/**'
+      branch 'master'
+      }
+      steps {
+      echo 'Running Integration Tests on vote app'
+      dir('vote') {
+        sh 'sh integration_test.sh'
+      }
+      }
+    }
+
+    stage('vote-docker-package') {
+      agent any
+      steps {
+        echo 'Packaging vote app with docker'
+        script {
+          docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin') {
+            // ./vote is the path to the Dockerfile that Jenkins will find from the Github repo
+            def voteImage = docker.build("norahns/vote:${env.GIT_COMMIT}", "./vote")
+            voteImage.push()
+            voteImage.push("${env.BRANCH_NAME}")
+            voteImage.push("latest")
+          }
+        }
+
+      }
+    }
+
+
+    stage('deploy to dev') {
+      agent any
+      when {
+        branch 'master'
+      }
+      steps {
+        echo 'Deploy instavote app with docker compose'
+        sh 'docker-compose up -d'
+      }
+    }
+
+  }
+
+  post {
+    always {
+      echo 'Building mono pipeline for voting app is completed.'
+    }
+  }
+}

README.md

@@ -1,3 +1,5 @@
+2 TRY
+
 Example Voting App
 =========
 

docker-compose.yaml

@@ -0,0 +1,55 @@
+volumes:
+  db-data:
+
+networks:
+  instavote:
+    driver: bridge
+
+services:
+  vote:
+    image: norahns/vote:latest
+    build: ./vote
+    ports:
+      - 5000:80
+    depends_on:
+      - redis
+    networks:
+      - instavote
+
+  redis:
+    image: redis:alpine
+    networks:
+      - instavote
+
+  db:
+    image: postgres:15-alpine
+    environment:
+      POSTGRES_USER: "postgres"
+      POSTGRES_PASSWORD: "postgres"
+    volumes:
+      - "db-data:/var/lib/postgresql/data"
+      - "./healthchecks:/healthchecks"
+    healthcheck:
+      test: /healthchecks/postgres.sh
+      interval: "5s"
+    networks:
+      - instavote
+
+  result:
+    image: norahns/result:latest
+    build: ./result
+    ports:
+      - 5001:80
+    depends_on:
+      - db
+    networks:
+      - instavote
+
+  worker:
+    image: norahns/worker:latest
+    build: ./worker
+    depends_on:
+      - redis
+      - db
+    networks:
+      - instavote

e2e/.env

@@ -1,3 +1,3 @@
-VOTE_IMAGE=xxxx/vote:latest
-WORKER_IMAGE=xxxx/worker:latest
-RESULT_IMAGE=xxxx/result:latest
+VOTE_IMAGE=norahns/vote:latest
+WORKER_IMAGE=norahns/worker:latest
+RESULT_IMAGE=norahns/result:latest

e2e/tests/Dockerfile

@@ -9,4 +9,4 @@ RUN apt-get update -qq && apt-get install -qy \
 RUN yarn global add phantomjs-prebuilt
 ADD . /app
 WORKDIR /app
-CMD ./tests.sh
+CMD ./tests.sh

e2e/tests/tests.sh

@@ -2,48 +2,42 @@
 
 # Function to get current vote count
 get_vote_count() {
-    phantomjs render.js "http://result:80/" | grep -i vote | cut -d ">" -f 4 | cut -d " " -f1
+    # Extracts the number of votes like "7 votes" => "7"
+    phantomjs render.js "http://result:80/" | grep -oE '[0-9]+ votes' | grep -oE '[0-9]+'
 }
 
 # Wait for services to be ready
 echo "Waiting for services to be ready..."
-while ! timeout 1 bash -c "echo > /dev/tcp/vote/80"; do
+while ! timeout 1 bash -c "echo > /dev/tcp/vote/80" 2>/dev/null; do
     sleep 1
 done
 echo "Vote service is ready."
 
-while ! timeout 1 bash -c "echo > /dev/tcp/result/80"; do
+while ! timeout 1 bash -c "echo > /dev/tcp/result/80" 2>/dev/null; do
     sleep 1
 done
 echo "Result service is ready."
 
 # Get initial vote count
 initial_count=$(get_vote_count)
-
 echo "Initial vote count: $initial_count"
 
-
-
 # Submit first vote
 echo "Submitting vote (a)..."
-curl -sS -X POST --data "vote=a" http://vote
+curl -sS -X POST --data "vote=a" http://vote > /dev/null
 sleep 2
+
+# Get vote count after submission
 current=$(get_vote_count)
 echo "Vote count after first submission: $current"
 
-# Calculate expected next count
-# final=$((initial_count + 1))
-# echo "Expected final count: $final"
-
-# Check vote count multiple times
-# for i in {1..5}; do
-   # sleep 2
+# Try again if result is unstable or delayed
+sleep 2
 new=$(get_vote_count)
-# done
 
 # Final check
 echo "Performing final check..."
-if [ $initial_count -lt $new ]; then
+if ! [ -z "$initial_count" ] && ! [ -z "$new" ] && [ "$initial_count" -lt "$new" ]; then
     echo -e "\e[42m------------"
     echo -e "\e[92mTests passed"
     echo -e "\e[42m------------"
@@ -52,6 +46,6 @@ else
     echo -e "\e[41m------------"
     echo -e "\e[91mTests failed"
     echo -e "\e[41m------------"
-    echo "Expected: $next, Actual: $new"
+    echo "Expected: greater than $initial_count, Actual: $new"
     exit 1
 fi