diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000..476b3c7c2 --- /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 diff --git a/Makefile b/Makefile index 2f00ced84..b72dfe89b 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ install: pip install -r requirements.txt update_env: @awk '/^ODOO_TAG=/ { $$0 = "ODOO_TAG=${BRANCH}" } 1' ${DEPLOY_PATH}/.env > ${DEPLOY_PATH}/.env.tmp && mv ${DEPLOY_PATH}/.env.tmp ${DEPLOY_PATH}/.env -build-image: update_tag +build-image: update_env DOCKER_BUILDKIT=1 ${DOCKER_BUILD} . --progress plain --tag ${ODOO_IMAGE} push-image: $(DOCKERPUSH) ${ODOO_IMAGE}