Skip to content

Commit ea5a21e

Browse files
authored
Merge pull request #362 from camptocamp/imp-exit-on-error
imp: run-parts exit on error
2 parents d6c6d14 + 07ea2ab commit ea5a21e

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181

8282
- name: Scan image
8383
id: scan
84-
uses: sysdiglabs/scan-action@v5
84+
uses: sysdiglabs/scan-action@v6.1.3
8585
with:
8686
sysdig-secure-url: https://eu1.app.sysdig.com
8787
stop-on-failed-policy-eval: false

HISTORY.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
.. **Features and Improvements**
99
1010
* Replace environment variable OPENERP_SERVER with ODOO_RC
11+
* Entrypoint: exit on error when executing run-parts
1112

1213
.. **Bugfixes**
1314

bin/docker-entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ ARGS=(${CMD_ARRAY[@]:1})
9595
if [ "$BASE_CMD" = "odoo" ] || [ "$BASE_CMD" = "odoo.py" ] || [ "$BASE_CMD" = "migrate" ]; then
9696
BEFORE_MIGRATE_ENTRYPOINT_DIR=/odoo/before-migrate-entrypoint.d
9797
if [ -d "$BEFORE_MIGRATE_ENTRYPOINT_DIR" ]; then
98-
run-parts --verbose "$BEFORE_MIGRATE_ENTRYPOINT_DIR"
98+
run-parts --exit-on-error --verbose "$BEFORE_MIGRATE_ENTRYPOINT_DIR"
9999
fi
100100
fi
101101
if [ "$BASE_CMD" = "odoo" ] || [ "$BASE_CMD" = "odoo.py" ]; then
@@ -111,7 +111,7 @@ if [ "$BASE_CMD" = "odoo" ] || [ "$BASE_CMD" = "odoo.py" ]; then
111111

112112
START_ENTRYPOINT_DIR=/odoo/start-entrypoint.d
113113
if [ -d "$START_ENTRYPOINT_DIR" ]; then
114-
run-parts --verbose "$START_ENTRYPOINT_DIR"
114+
run-parts --exit-on-error --verbose "$START_ENTRYPOINT_DIR"
115115
fi
116116

117117
exec "$@"

0 commit comments

Comments
 (0)