Revert "[TELE-1759]update for bookworm's migration change Makefile, c…

…reate bookworm's image with jenkinsfile" This reverts commit 85b2dd5.
IMIO · Oct 3, 2023 · dee91ab · dee91ab
1 parent 0ce6802
commit dee91ab
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 63 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -32,18 +32,6 @@ pipeline {
             }
           }
         }
-        stage("bookworm") {
-          agent any
-          steps {
-            script {
-              if (params.USE_CACHE_TO_BUILD_IMAGE) {
-                sh 'make build-bookworm'
-              } else {
-                sh 'make build-no-cache-bookworm'
-              }
-            }
-          }
-        }
       }
     }
     stage('Build test image') {
@@ -60,18 +48,6 @@ pipeline {
             }
           }
         }
-        stage('bookworm-test') {
-          agent any
-          steps {
-            script {
-              if (params.USE_CACHE_TO_BUILD_IMAGE) {
-                sh 'make build-bookworm-test'
-              } else {
-                sh 'make build-no-cache-bookworm-test'
-              }
-            }
-          }
-        }
       }
     }
     stage('Push base prod image to staging registry') {
@@ -94,12 +70,6 @@ pipeline {
             )
           }
         }
-        stage("bookworm") {
-          agent any
-          steps {
-            echo 'push teleservices/bookworm'
-          }
-        }
       }
     }
     stage('Push other images to staging registry') {

diff --git a/Makefile b/Makefile
@@ -39,39 +39,6 @@ build-no-cache-bullseye-test:
 run-bullseye-test:
 		make run branch=bullseye-test
 
-build-bookworm-base:
-		cd teleservices && \
-		docker build --pull -f Dockerfile-base -t imiobe/teleservices-bookworm-base:latest \
-		--build-arg DEBIAN_VERSION=bookworm \
-		.
-
-build-bookworm:
-		cd teleservices && \
-		docker build --pull --target prod-image -t teleservices/bookworm:latest \
-		--build-arg DEBIAN_VERSION=bookworm \
-		.
-
-build-bookworm-test:
-		cd teleservices && \
-		docker build --pull --target dev-image -t teleservices/bookworm-test:latest \
-		--build-arg DEBIAN_VERSION=bookworm \
-		.
-
-build-no-cache-bookworm:
-		cd teleservices && \
-		docker build --pull --no-cache --target prod-image -t teleservices/bookworm:latest \
-		--build-arg DEBIAN_VERSION=bookworm \
-		.
-
-build-no-cache-bookworm-test:
-		cd teleservices && \
-		docker build --pull --no-cache --target dev-image -t teleservices/bookworm-test:latest \
-		--build-arg DEBIAN_VERSION=bookworm \
-		.
-
-run-bookworm-test:
-		make run branch=bookworm-test
-
 fast-clean:
 	docker-compose down -v
 	sudo rm -fr data/*/*/ data/wcs/config.pck data/wcs/.rnd

diff --git a/README.md b/README.md
@@ -28,6 +28,7 @@ Supported modules are:
 * combo
 * imio-publik-themes (hence publik-base-theme)
 * passerelle
+* passerelle-imio-tax-compute
 * passerelle-imio-ia-aes
 
 Services will be run in django-runserver mode, and can be seen in a screen