From b4c0bdb770b2c16290ff8cb573e14963729500e8 Mon Sep 17 00:00:00 2001 From: Bolverkr14 Date: Wed, 9 Apr 2025 10:58:44 +0200 Subject: [PATCH 01/10] dockerfile added --- DockerFIle | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 DockerFIle diff --git a/DockerFIle b/DockerFIle new file mode 100644 index 00000000..c93e2d9a --- /dev/null +++ b/DockerFIle @@ -0,0 +1,11 @@ +# Utiliser l'image Apache officielle +FROM httpd:2.4 + +# Supprimer le contenu par défaut d'Apache (optionnel) +RUN rm -rf /usr/local/apache2/htdocs/* + +# Copier tout ton site dans le dossier d’Apache +COPY . /usr/local/apache2/htdocs/ + +# Exposer le port 80 +EXPOSE 80 \ No newline at end of file From 916b0ff58211624f5c3edf7c1d82ac75aebb57f3 Mon Sep 17 00:00:00 2001 From: Bolverkr14 Date: Wed, 9 Apr 2025 11:36:55 +0200 Subject: [PATCH 02/10] jenkins added --- Jenkinsfile | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..476b3c7c --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,21 @@ +pipeline { + agent any + + stages { + stage('Build') { + steps { + echo 'Building..' + } + } + stage('Test') { + steps { + echo 'Testing..' + } + } + stage('Deploy') { + steps { + echo 'Deploying....' + } + } + } +} \ No newline at end of file From 1eafd26a4ab23c72d276517fa1c8fb0e387d4146 Mon Sep 17 00:00:00 2001 From: Bolverkr14 Date: Wed, 9 Apr 2025 11:37:53 +0200 Subject: [PATCH 03/10] test --- DockerFIle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/DockerFIle b/DockerFIle index c93e2d9a..491e85a0 100644 --- a/DockerFIle +++ b/DockerFIle @@ -8,4 +8,6 @@ RUN rm -rf /usr/local/apache2/htdocs/* COPY . /usr/local/apache2/htdocs/ # Exposer le port 80 -EXPOSE 80 \ No newline at end of file +EXPOSE 80 + +# coucou \ No newline at end of file From 1800dc70be5d6244b9cb5559fa81a785821d7841 Mon Sep 17 00:00:00 2001 From: Bolverkr14 Date: Wed, 9 Apr 2025 12:30:10 +0200 Subject: [PATCH 04/10] chgt --- Jenkinsfile | 52 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 476b3c7c..1d8ed615 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,21 +1,47 @@ pipeline { - agent any + agent any - stages { - stage('Build') { - steps { - echo 'Building..' - } +stages{ + //------------------------------------------------ + stage('Generate Local Tag') { + steps { + script { + def shortHash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim() + def timestamp = new Date().format('yyyyMMddHHmmss') + env.LOCAL_TAG = "v${timestamp}-${shortHash}" + + echo "Generated Local Tag: ${env.LOCAL_TAG}" } - stage('Test') { - steps { - echo 'Testing..' + } + } + + //------------------------------------------------ + + stage('Docker Build & Push') { + steps { + withCredentials([string(credentialsId: 'Bolverkr14', variable: 'bolverkr_pw')]) { + echo "print tag : $LOCAL_TAG" + sh 'docker login -u attilaisnotdead -p $bolverkr_pw' + sh 'docker build -t attilaisnotdead/yl_website:$LOCAL_TAG .' + sh 'docker push attilaisnotdead/yl_website:$LOCAL_TAG' } } - stage('Deploy') { - steps { - echo 'Deploying....' - } + } + + //------------------------------------------------ + + stage(' Deployment docker ') { + steps { + + script { + sh 'sudo docker ps -a --filter "name=attilaisnotdead" --format "{{.ID}}" |sudo xargs -r docker stop' + sh 'sudo docker ps -a --filter "name=attilaisnotdead" --format "{{.ID}}" |sudo xargs -r docker rm' + sh 'docker run -d -p 9999:80 --name attilaisnotdead$LOCAL_TAG attilaisnotdead/yl_website:$LOCAL_TAG' + } + } } +//------------------------------------------------ +} + } \ No newline at end of file From c953dce1fc6bf2651a3f179f5e160e0bce6343b2 Mon Sep 17 00:00:00 2001 From: Bolverkr14 Date: Wed, 9 Apr 2025 14:02:48 +0200 Subject: [PATCH 05/10] nothigntoadd --- DockerFIle | 2 -- 1 file changed, 2 deletions(-) diff --git a/DockerFIle b/DockerFIle index 491e85a0..9c9b08f2 100644 --- a/DockerFIle +++ b/DockerFIle @@ -9,5 +9,3 @@ COPY . /usr/local/apache2/htdocs/ # Exposer le port 80 EXPOSE 80 - -# coucou \ No newline at end of file From 7d830bd35933fe02f5e0a2a004083781cf16f167 Mon Sep 17 00:00:00 2001 From: Bolverkr14 Date: Wed, 9 Apr 2025 14:03:58 +0200 Subject: [PATCH 06/10] jenkins --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1d8ed615..796e6d07 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,8 +22,8 @@ stages{ withCredentials([string(credentialsId: 'Bolverkr14', variable: 'bolverkr_pw')]) { echo "print tag : $LOCAL_TAG" sh 'docker login -u attilaisnotdead -p $bolverkr_pw' - sh 'docker build -t attilaisnotdead/yl_website:$LOCAL_TAG .' - sh 'docker push attilaisnotdead/yl_website:$LOCAL_TAG' + sh 'docker build -t attilaisnotdead/websiteyann:$LOCAL_TAG .' + sh 'docker push attilaisnotdead/websiteyann:$LOCAL_TAG' } } } @@ -36,7 +36,7 @@ stages{ script { sh 'sudo docker ps -a --filter "name=attilaisnotdead" --format "{{.ID}}" |sudo xargs -r docker stop' sh 'sudo docker ps -a --filter "name=attilaisnotdead" --format "{{.ID}}" |sudo xargs -r docker rm' - sh 'docker run -d -p 9999:80 --name attilaisnotdead$LOCAL_TAG attilaisnotdead/yl_website:$LOCAL_TAG' + sh 'docker run -d -p 9999:80 --name attilaisnotdead$LOCAL_TAG attilaisnotdead/websiteyann:$LOCAL_TAG' } } From 88657f4e0bc8d7e6a5e557ce9de01dba6b95fff4 Mon Sep 17 00:00:00 2001 From: Bolverkr14 Date: Wed, 9 Apr 2025 14:24:35 +0200 Subject: [PATCH 07/10] coucou --- DockerFIle | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/DockerFIle b/DockerFIle index 9c9b08f2..e69de29b 100644 --- a/DockerFIle +++ b/DockerFIle @@ -1,11 +0,0 @@ -# Utiliser l'image Apache officielle -FROM httpd:2.4 - -# Supprimer le contenu par défaut d'Apache (optionnel) -RUN rm -rf /usr/local/apache2/htdocs/* - -# Copier tout ton site dans le dossier d’Apache -COPY . /usr/local/apache2/htdocs/ - -# Exposer le port 80 -EXPOSE 80 From b1b146767100613b112520f4976decf167ab642d Mon Sep 17 00:00:00 2001 From: Bolverkr14 Date: Wed, 9 Apr 2025 14:25:14 +0200 Subject: [PATCH 08/10] coucou --- DockerFIle | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 DockerFIle diff --git a/DockerFIle b/DockerFIle deleted file mode 100644 index e69de29b..00000000 From 2b29bb83979dfbaff59e2e0c2cb3fe922f3aefb5 Mon Sep 17 00:00:00 2001 From: Bolverkr14 Date: Wed, 9 Apr 2025 14:25:51 +0200 Subject: [PATCH 09/10] coucou --- Dockerfile | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..a2cb38cb --- /dev/null +++ b/Dockerfile @@ -0,0 +1,12 @@ +# Utiliser l'image Apache officielle +FROM httpd:2.4 + +# Supprimer le contenu par défaut d'Apache (optionnel) +RUN rm -rf /usr/local/apache2/htdocs/* + +# Copier tout ton site dans le dossier d’Apache +COPY . /usr/local/apache2/htdocs/ + +# Exposer le port 80 +EXPOSE 80 + # coucou \ No newline at end of file From 7216d0f03ed5f7f7a5816f77c004de7fa3d02934 Mon Sep 17 00:00:00 2001 From: Bolverkr14 Date: Wed, 9 Apr 2025 14:29:00 +0200 Subject: [PATCH 10/10] oui --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 1a429961..e86fd148 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,7 @@ - My Website + CEST AMOI CE BEAU SITE