NextERP/Odoo18-Base
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'main' into develop

Browse Source
This commit is contained in:
hoangvv 2025-01-08 00:49:27 +07:00
commit 13404e7b1e
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Jenkinsfile vendored
View File

@ -5,6 +5,7 @@ node('Node-Dev-100163') {
checkout scm checkout scm
} }
stage('Cleanup') { stage('Cleanup') {
sh "make update_tag CURR_BRANCH=${env.BRANCH_NAME}"
sh 'make clean_up' sh 'make clean_up'
} }
stage('Build') { stage('Build') {

5
Makefile
View File

@ -10,10 +10,9 @@ DOCKER_PUSH=$(DOCKERCMD) push
DOCKER_IMAGE=$(DOCKERCMD) image DOCKER_IMAGE=$(DOCKERCMD) image
DEPLOY_PATH=${PWD}/deployment DEPLOY_PATH=${PWD}/deployment
SETUP_PATH=${PWD}/setup SETUP_PATH=${PWD}/setup
HASH := $(shell git rev-parse HEAD)
CONFIG=odoo.conf CONFIG=odoo.conf
ODOO_IMAGE=hub.nextzenos.com/nexterp/odoo ODOO_IMAGE=hub.nextzenos.com/nexterp/odoo
TAG := develop TAG := $(shell rev-parse --abbrev-ref HEAD)
CONTAINER_ID=odoo-${TAG} CONTAINER_ID=odoo-${TAG}
install: install:
sudo apt -y update && \ sudo apt -y update && \
@ -39,6 +38,8 @@ run_server_docker:
fi fi
cd ${DEPLOY_PATH} &&\ cd ${DEPLOY_PATH} &&\
${DOCKER_COMPOSE_CMD} up -d ${DOCKER_COMPOSE_CMD} up -d
update_tag:
${SETUP_PATH}/update_tag.sh $(CURR_BRANCH)
restore_database: restore_database:
@echo "Checking for backup.zip in container..." @echo "Checking for backup.zip in container..."
@if sudo docker exec ${CONTAINER_ID} test -f /etc/odoo/backup/backup.zip; then \ @if sudo docker exec ${CONTAINER_ID} test -f /etc/odoo/backup/backup.zip; then \

3
setup/update_tag.sh Executable file
View File

@ -0,0 +1,3 @@
#!/usr/bin/bash
set +x
sed -i "s/TAG := \$(shell rev-parse --abbrev-ref HEAD)/TAG := $1/g" Makefile