diff --git a/.gitea/workflows/workflows.yaml b/.gitea/workflows/workflows.yaml index fe58939..68648d9 100644 --- a/.gitea/workflows/workflows.yaml +++ b/.gitea/workflows/workflows.yaml @@ -27,37 +27,38 @@ jobs: path: . fetch-depth: 0 - - name: Testing - run: | - modules_to_update=$(git diff --name-only ${{ gitea.event.before }}..${{ gitea.event.after }} | awk -F/ '{print $1}') - echo $modules_to_update + # - name: Testing + # run: | + # modules_to_update=$(git diff --name-only ${{ gitea.event.before }}..${{ gitea.event.after }} | awk -F/ '{print $1}') + # echo $modules_to_update - export SSHPASS=${{ secrets.SERVER_SSH_PASSWORD }} - export STACK_PATH="/home/sysop/odoo18/customaddons/bross_hms" + # export SSHPASS=${{ secrets.SERVER_SSH_PASSWORD }} + # export STACK_PATH="/home/sysop/odoo18/customaddons/bross_hms" - sshpass -e ssh -p ${{ secrets.SERVER_SSH_PORT }} -o StrictHostKeyChecking=no \ - ${{ secrets.SERVER_SSH_USER }}@${{ secrets.SERVER_SSH_HOST }} "echo $modules_to_update > testing_file" + # sshpass -e ssh -p ${{ secrets.SERVER_SSH_PORT }} -o StrictHostKeyChecking=no \ + # ${{ secrets.SERVER_SSH_USER }}@${{ secrets.SERVER_SSH_HOST }} "echo $modules_to_update > testing_file" - name: Deploy to main environment if: gitea.ref == 'refs/heads/dev' run: | - ### Get current commit - # commit_hash=$(git rev-parse --short HEAD) - - ### Update local repo - # cd /opt/odoo/extra-addons - # git pull + export SSHPASS=${{ secrets.SERVER_SSH_PASSWORD }} + export STACK_PATH="/home/sysop/odoo18/customaddons/bross_hms" ### Get modules list to update modules_to_update=$(git diff --name-only ${{ gitea.event.before }}..${{ gitea.event.after }} | awk -F/ '{print $1}' | uniq | xargs -I {} sh -c 'find {} -type f -name "__manifest__.py" | grep -q "__manifest__.py" && echo {}' 2>/dev/null | sed -z 's/\n/,/g; s/,$/\n/') echo $modules_to_update + ### Generate update string - # if [ -z "${modules_to_update}" ]; then - # echo "No module to update" - # # args="-d fms" - # else - # echo "Modules to update set" - # args="-d fms_prod -u ${modules_to_update}" - # docker compose -f /opt/odoo/docker-compose.yml down - # export ADDONS="--addons-path=/opt/odoo/addons/,/mnt/extra-addons/" && export ARGS=${args} && docker compose -f /opt/odoo/docker-compose.yml up -d - # fi + if [ -z "${modules_to_update}" ]; then + echo "No module to update" + else + echo "Modules to update set" + args="-d bross_hms_dev -u ${modules_to_update}" + sshpass -e ssh -p ${{ secrets.SERVER_SSH_PORT }} -o StrictHostKeyChecking=no \ + ${{ secrets.SERVER_SSH_USER }}@${{ secrets.SERVER_SSH_HOST }} \ + "cd $STACK_PATH && git pull && docker compose -f docker-compose-dev.yml down && export ARGS='${args}' && docker compose -f docker-compose-dev.yml up -d" + fi + + + + diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 101f6d7..25c77d2 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -21,7 +21,7 @@ services: # - 8069:8069 volumes: - /home/sysop/odoo18/:/opt/odoo/ - - /home/sysop/odoo18/customaddons/${CUSTOMADDONS_DIR}/odoo.conf:/etc/odoo.conf + - /home/sysop/odoo18/customaddons/${CUSTOMADDONS_DIR}/odoo-dev.conf:/etc/odoo.conf - odoo_18_filestore:/root/.local/share/Odoo/ depends_on: - db diff --git a/odoo.conf b/odoo.conf index c4b84d8..50ee5cf 100644 --- a/odoo.conf +++ b/odoo.conf @@ -1,5 +1,5 @@ [options] -admin_passwd = $pbkdf2-sha512$25000$633v3ZuT0novhVAqhdDamw$fKiY4ilP5EF8xLv66kljQ1WWppTQgraLUMDANMT3rlx01C6luc27z3PPj.wbgTPy8VUvL6LPjLGSHdlqlHXn6A +admin_passwd = $pbkdf2-sha512$25000$ca4VYuyd03rP.Z.zNsbYmw$RmR191OydA7ha820NAhyDYVkGlJsdWiSq/mwkMV/x8fbx0Qh4wOHR0JJYo/7z0nYOKygLPYU38S7C4g355k4HA ;admin_passwd = admin ;addons_path = /mnt/extra-addons ;data_dir = /var/lib/odoo