update

.gitignore

@@ -22,7 +22,7 @@ odoo/filestore
 odoo/addons/base/maintenance
 # window installation config file
 /odoo.conf
-/deployment/postgresql
+deployment/etc/odoo.conf
 # generated for windows installer?
 install/win32/*.bat
 install/win32/meta.py
@@ -49,4 +49,5 @@ package.json
 /man/
 /share/
 /src/
-deployment/postgresql/*
+/deployment/postgresql/*
+/deployment/etc/*

Jenkinsfile

@@ -16,6 +16,9 @@ node('Node-Dev-100163') {
             }
         }
         stage('Start Docker Container'){
+            steps{
+               sh 'make clean_up' 
+            }
             steps{
                sh 'make run-server-docker' 
             }
@@ -25,6 +28,11 @@ node('Node-Dev-100163') {
                sh 'make run_test_docker' 
             }
         }
+        stage('Publish') {
+            steps{
+               sh 'make push-image' 
+            }
+        }
         currentBuild.result = "SUCCESS" // Set success status after all stages complete
     } catch (err) {
         currentBuild.result = "FAILURE"

Makefile

@@ -45,10 +45,14 @@ clean_up:
 		cd ${DEPLOY_PATH}  &&\
 		${DOCKER_COMPOSE_CMD} down; \
 	fi
-	find ${DEPLOY_PATH} -mindepth 1 -maxdepth 1 -type d \
-    ! -name "etc" \
-	! -name "addons" \
-    ! -name "file_to_keep.txt" \
-    ! -name "*.log" \
-    -exec rm -rf {} +
+	find "${DEPLOY_PATH}" -mindepth 1 -maxdepth 1  \
+		! -name "etc" \
+		! -name "addons" \
+		! -name "*.sh" \
+		! -name "*.template" \
+		! -name "*.py" \
+		! -name "*.yml" \
+		-print0 | xargs -0 rm -rf {} && \
+	rm -rf ${DEPLOY_PATH}/etc/*
+	
 	

deployment/etc/odoo.conf

@@ -1,8 +0,0 @@
-[options]
-addons_path = /mnt/extra-addons
-data_dir = /var/lib/odoo
-db_host = db
-db_port = 5432
-db_user = nexterp
-db_password = 2Gltp2kbNgEwpikRdyYaUNO2
-