diff --git a/.gitea/workflows/init_setup_environment.yml b/.gitea/workflows/init_setup_environment.yml index bfd03a2c3..7625c9d16 100644 --- a/.gitea/workflows/init_setup_environment.yml +++ b/.gitea/workflows/init_setup_environment.yml @@ -89,7 +89,7 @@ jobs: run: make run_server_docker - name: Sleep for 10 seconds - run: sleep 300s + run: sleep 10s - name: Restore Database if: contains(github.event.head_commit.message, '@restore_db') diff --git a/Dockerfile b/Dockerfile index 196a2bd85..3af1b9671 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,11 +7,13 @@ COPY ./deployment/entrypoint.sh / # COPY deployment/entrypoint.sh / # COPY deployment/odoo.conf /etc/odoo/ -# Set permissions and Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons +# Set permissions and Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons and /mnt/backup for backup RUN chown odoo /etc/odoo/odoo.conf \ && mkdir -p /mnt/extra-addons \ - && chown -R odoo /mnt/extra-addons -VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] + && chown -R odoo /mnt/extra-addons \ + && mkdir -p /mnt/backup \ + && chown -R odoo /mnt/backup +VOLUME ["/var/lib/odoo", "/mnt/extra-addons","/mnt/backup"] # Expose Odoo services EXPOSE 8069 8071 8072 diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml index d8e9755ac..7492b21c2 100755 --- a/deployment/docker-compose.yml +++ b/deployment/docker-compose.yml @@ -18,7 +18,7 @@ services: volumes: - ${ODOO_ADDONS:-./addons}:/mnt/extra-addons - ${ODOO_CONFIG:-./etc}:/etc/odoo - - ${ODOO_BACKUP:-./backup}:/etc/odoo/backup + - ${ODOO_BACKUP:-./backup}:/mnt/backup restart: always db: image: postgres:16