From 7fd6289d5b81ecb15e8499f5dd7f058cccaf4113 Mon Sep 17 00:00:00 2001
From: lenape <jacquesingram.online>
Date: Tue, 4 Mar 2025 23:39:52 +0000
Subject: [PATCH] this one will work

---
 Jenkinsfile                      | 54 +++++++++++++++++++++++---------
 Jenkinsfile-push-gitea-dockerhub |  5 +--
 2 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 384c1a9..1df6e8e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,35 +1,59 @@
 pipeline {
-    agent any
 
-    environment {
-        DOCKERHUB_REPO = 'jacqueskingram/python-jenkins-project'
-        GITEA_REPO = 'https://code.jacquesingram.online/lenape/python-jenkins-project.git'
-    }
+    agent any
 
     stages {
+
         stage('Build Docker Image') {
+
             steps {
+
                 script {
-                    def imageName = "${env.DOCKERHUB_REPO}:${BUILD_NUMBER}"
-                    docker.build(imageName, '.')
+
+                    def imageName = "python-jenkins-project:${BUILD_NUMBER}"
+
+                    sh "DOCKER_BUILDKIT=0 docker build --no-cache -t ${imageName} ."
+
                     env.IMAGE_NAME = imageName
+
                 }
+
             }
+
         }
-        stage('Push to Gitea') {
+
+        stage('Deploy Docker Container') {
+
             steps {
-                git credentialsId: 'my-gitea-credentials', url: "${env.GITEA_REPO}"
-                sh 'git push origin master'
+
+                script {
+
+                    sh "docker stop python-jenkins-container || true"
+
+                    sh "docker rm python-jenkins-container || true"
+
+                    sh "docker run -d -p 5555:80 --name python-jenkins-container ${env.IMAGE_NAME}"
+
+                }
+
             }
+
         }
-        stage('Push to Docker Hub') {
+
+        stage('Verify Deployment') {
+
             steps {
+
                 script {
-                    docker.withRegistry('https://index.docker.io/v1/', 'my-dockerhub-credentials') {
-                        docker.image(env.IMAGE_NAME).push()
-                    }
+
+                    sh "curl http://38.110.1.139:5555"
+
                 }
+
             }
+
         }
+
     }
-}
+
+} 
diff --git a/Jenkinsfile-push-gitea-dockerhub b/Jenkinsfile-push-gitea-dockerhub
index b8fd139..384c1a9 100644
--- a/Jenkinsfile-push-gitea-dockerhub
+++ b/Jenkinsfile-push-gitea-dockerhub
@@ -19,10 +19,7 @@ pipeline {
         stage('Push to Gitea') {
             steps {
                 git credentialsId: 'my-gitea-credentials', url: "${env.GITEA_REPO}"
-                sh '''
-                    git checkout -b master
-                    git push origin master
-                '''
+                sh 'git push origin master'
             }
         }
         stage('Push to Docker Hub') {