Skip to content
Merged
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
1 change: 0 additions & 1 deletion 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 @@ -148,7 +148,6 @@
# need to upgrade setuptools, since the fixes for CVE-2024-6345 rolled out in base images we get errors "error: invalid command 'bdist_wheel'"
# We need setuptools lower than 82 as odoo uses pkg_resources and it was removed in 82.0.0
&& pip install --upgrade "setuptools<82" \
&& pip install --upgrade setuptools \
&& pip install -r requirements.txt \
'websocket-client~=0.56' \
astor \
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -146,7 +146,7 @@
# cbor2==5.4.2 no longer builds as pkg_resources is removed, and 5.4.6 is already pre-built
&& sed -i -E "s/(cbor2==)5\.4\.2( ; python_version < '3.12')/\15.4.6\2/" requirements.txt \
# need to upgrade setuptools, since the fixes for CVE-2024-6345 rolled out in base images we get errors "error: invalid command 'bdist_wheel'"
&& pip install --upgrade setuptools \
&& pip install --upgrade "setuptools<82" \
&& pip install -r requirements.txt \
'websocket-client~=0.56' \
astor \
Expand Down
Loading