Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 11.0.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ LABEL org.label-schema.schema-version="$VERSION" \
org.label-schema.build-date="$BUILD_DATE" \
org.label-schema.vcs-ref="$VCS_REF" \
org.label-schema.vcs-url="https://github.com/Tecnativa/doodba"

HEALTHCHECK --interval=1m --timeout=1s --start-period=30s --start-interval=1s --retries=3 CMD [ "/usr/local/bin/healthcheck" ]
# Onbuild version, with all the magic
FROM base AS onbuild

Expand Down
2 changes: 2 additions & 0 deletions 12.0.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ LABEL org.label-schema.schema-version="$VERSION" \
org.label-schema.vcs-ref="$VCS_REF" \
org.label-schema.vcs-url="https://github.com/Tecnativa/doodba"

HEALTHCHECK --interval=1m --timeout=1s --start-period=30s --start-interval=1s --retries=3 CMD [ "/usr/local/bin/healthcheck" ]

# Onbuild version, with all the magic
FROM base AS onbuild

Expand Down
2 changes: 2 additions & 0 deletions 13.0.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
ARG MQT=https://github.com/OCA/maintainer-quality-tools.git
ARG WKHTMLTOPDF_VERSION=0.12.5
ARG WKHTMLTOPDF_CHECKSUM='dfab5506104447eef2530d1adb9840ee3a67f30caaad5e9bcb8743ef2f9421bd'
ENV DB_FILTER=.* \

Check warning on line 9 in 13.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push-pr (13.0, linux/amd64)

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 9 in 13.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push-pr (13.0, linux/amd64)

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
DEPTH_DEFAULT=1 \
DEPTH_MERGE=100 \
EMAIL=https://hub.docker.com/r/tecnativa/odoo \
Expand Down Expand Up @@ -162,6 +162,8 @@
org.label-schema.vcs-ref="$VCS_REF" \
org.label-schema.vcs-url="https://github.com/Tecnativa/doodba"

HEALTHCHECK --interval=1m --timeout=1s --start-period=30s --start-interval=1s --retries=3 CMD [ "/usr/local/bin/healthcheck" ]

# Onbuild version, with all the magic
FROM base AS onbuild

Expand Down
2 changes: 2 additions & 0 deletions 14.0.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
ARG WKHTMLTOPDF_VERSION=0.12.5
ARG WKHTMLTOPDF_AMD64_CHECKSUM='dfab5506104447eef2530d1adb9840ee3a67f30caaad5e9bcb8743ef2f9421bd'
ARG WKHTMLTOPDF_ARM64_CHECKSUM="3344e3a72f4cb4c1218cf48ac5fa9e88bef62aa7fa6f2295be7d5bc1fef100b1"
ENV DB_FILTER=.* \

Check warning on line 10 in 14.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push-pr (14.0, linux/amd64,linux/arm64)

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 10 in 14.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push-pr (14.0, linux/amd64,linux/arm64)

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
DEPTH_DEFAULT=1 \
DEPTH_MERGE=100 \
EMAIL=https://hub.docker.com/r/tecnativa/odoo \
Expand Down Expand Up @@ -179,6 +179,8 @@
org.label-schema.vcs-ref="$VCS_REF" \
org.label-schema.vcs-url="https://github.com/Tecnativa/doodba"

HEALTHCHECK --interval=1m --timeout=1s --start-period=30s --start-interval=1s --retries=3 CMD [ "/usr/local/bin/healthcheck" ]

# Onbuild version, with all the magic
FROM base AS onbuild

Expand Down
2 changes: 2 additions & 0 deletions 15.0.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
ARG WKHTMLTOPDF_VERSION=0.12.5
ARG WKHTMLTOPDF_AMD64_CHECKSUM='dfab5506104447eef2530d1adb9840ee3a67f30caaad5e9bcb8743ef2f9421bd'
ARG WKHTMLTOPDF_ARM64_CHECKSUM="3344e3a72f4cb4c1218cf48ac5fa9e88bef62aa7fa6f2295be7d5bc1fef100b1"
ENV DB_FILTER=.* \

Check warning on line 10 in 15.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push-pr (15.0, linux/amd64,linux/arm64)

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 10 in 15.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push-pr (15.0, linux/amd64,linux/arm64)

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
DEPTH_DEFAULT=1 \
DEPTH_MERGE=100 \
EMAIL=https://hub.docker.com/r/tecnativa/odoo \
Expand Down Expand Up @@ -176,6 +176,8 @@
org.label-schema.vcs-ref="$VCS_REF" \
org.label-schema.vcs-url="https://github.com/Tecnativa/doodba"

HEALTHCHECK --interval=1m --timeout=1s --start-period=30s --start-interval=1s --retries=3 CMD [ "/usr/local/bin/healthcheck" ]

# Onbuild version, with all the magic
FROM base AS onbuild

Expand Down
2 changes: 2 additions & 0 deletions 16.0.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
ARG FIRST_UID=500
ARG FIRST_GID=500

ENV DB_FILTER=.* \

Check warning on line 16 in 16.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push-pr (16.0, linux/amd64,linux/arm64)

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 16 in 16.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push-pr (16.0, linux/amd64,linux/arm64)

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
DEPTH_DEFAULT=1 \
DEPTH_MERGE=100 \
EMAIL=https://hub.docker.com/r/tecnativa/odoo \
Expand Down Expand Up @@ -181,6 +181,8 @@
org.label-schema.vcs-ref="$VCS_REF" \
org.label-schema.vcs-url="https://github.com/Tecnativa/doodba"

HEALTHCHECK --interval=1m --timeout=1s --start-period=30s --start-interval=1s --retries=3 CMD [ "/usr/local/bin/healthcheck" ]

# Onbuild version, with all the magic
FROM base AS onbuild

Expand Down
2 changes: 2 additions & 0 deletions 17.0.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
ARG LAST_SYSTEM_GID=499
ARG FIRST_UID=500
ARG FIRST_GID=500
ENV DB_FILTER=.* \

Check warning on line 15 in 17.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push-pr (17.0, linux/amd64,linux/arm64)

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 15 in 17.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push-pr (17.0, linux/amd64,linux/arm64)

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
DEPTH_DEFAULT=1 \
DEPTH_MERGE=100 \
EMAIL=https://hub.docker.com/r/tecnativa/odoo \
Expand Down Expand Up @@ -180,6 +180,8 @@
org.label-schema.vcs-ref="$VCS_REF" \
org.label-schema.vcs-url="https://github.com/Tecnativa/doodba"

HEALTHCHECK --interval=1m --timeout=1s --start-period=30s --start-interval=1s --retries=3 CMD [ "/usr/local/bin/healthcheck" ]

# Onbuild version, with all the magic
FROM base AS onbuild

Expand Down
2 changes: 2 additions & 0 deletions 18.0.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
ARG LAST_SYSTEM_GID=499
ARG FIRST_UID=500
ARG FIRST_GID=500
ENV DB_FILTER=.* \

Check warning on line 15 in 18.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push-pr (18.0, linux/amd64,linux/arm64)

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 15 in 18.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push-pr (18.0, linux/amd64,linux/arm64)

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
DEPTH_DEFAULT=1 \
DEPTH_MERGE=100 \
EMAIL=https://hub.docker.com/r/tecnativa/odoo \
Expand Down Expand Up @@ -182,6 +182,8 @@
org.label-schema.vcs-ref="$VCS_REF" \
org.label-schema.vcs-url="https://github.com/Tecnativa/doodba"

HEALTHCHECK --interval=1m --timeout=1s --start-period=30s --start-interval=1s --retries=3 CMD [ "/usr/local/bin/healthcheck" ]

# Onbuild version, with all the magic
FROM base AS onbuild

Expand Down
2 changes: 2 additions & 0 deletions 19.0.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
ARG LAST_SYSTEM_GID=499
ARG FIRST_UID=500
ARG FIRST_GID=500
ENV DB_FILTER=.* \

Check warning on line 15 in 19.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push-pr (19.0, linux/amd64,linux/arm64)

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 15 in 19.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push-pr (19.0, linux/amd64,linux/arm64)

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
DEPTH_DEFAULT=1 \
DEPTH_MERGE=100 \
EMAIL=https://hub.docker.com/r/tecnativa/odoo \
Expand Down Expand Up @@ -181,6 +181,8 @@
org.label-schema.vcs-ref="$VCS_REF" \
org.label-schema.vcs-url="https://github.com/Tecnativa/doodba"

HEALTHCHECK --interval=1m --timeout=1s --start-period=30s --start-interval=1s --retries=3 CMD [ "/usr/local/bin/healthcheck" ]

# Onbuild version, with all the magic
FROM base AS onbuild

Expand Down
7 changes: 7 additions & 0 deletions bin/healthcheck
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/usr/bin/env bash

if (( ${ODOO_VERSION/%.0} > 13));then
curl -sf http://localhost:8069/web/health || exit 1

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a simple approach to a healthcheck for the odoo services that over time did not work for us.

there is cases where odoo http does not come alive for a long time and the service should still be marked as healthy (e.g. tests and db restores).

also there is cases were those 2 urls do not catch basic errors in odoo becoming unhealthy for endusers that the basic urls do not catch.

this is why i proposed #701, you can use it as it is or as inspiration.

else
curl -sf http://localhost:8069/web/database/selector || exit 1
fi
Loading