Skip to content

[FIX] 15.0: Postgres apt repo was moved to archive #737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
david-banon-tecnativa merged 2 commits into from
Oct 2, 2026
Merged

[FIX] 15.0: Postgres apt repo was moved to archive #737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fd7ce7
[CHORE] Improve docker bake config
david-banon-tecnativa Oct 2, 2026
75bf019
[FIX] 15.0: Postgres apt repo was moved to archive
david-banon-tecnativa Oct 2, 2026
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 15.0.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
ARG WKHTMLTOPDF_VERSION=0.12.5
ARG WKHTMLTOPDF_AMD64_CHECKSUM='dfab5506104447eef2530d1adb9840ee3a67f30caaad5e9bcb8743ef2f9421bd'
ARG WKHTMLTOPDF_ARM64_CHECKSUM="3344e3a72f4cb4c1218cf48ac5fa9e88bef62aa7fa6f2295be7d5bc1fef100b1"
ENV DB_FILTER=.* \

Check warning on line 12 in 15.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (15.0, 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 12 in 15.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (15.0, 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 12 in 15.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (15.0, 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 12 in 15.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (15.0, 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 12 in 15.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (15.0, 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 12 in 15.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (15.0, 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 12 in 15.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (15.0, 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 12 in 15.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (15.0, 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 12 in 15.0.Dockerfile

View workflow job for this annotation

GitHub Actions / test (15.0, 14, 3.9, 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 @@ -79,7 +79,7 @@
telnet \
tk-dev \
vim \
&& echo 'deb https://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' >> /etc/apt/sources.list.d/postgresql.list \
&& echo 'deb https://apt-archive.postgresql.org/pub/repos/apt bullseye-pgdg main' >> /etc/apt/sources.list.d/postgresql.list \
&& curl -SL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
&& apt-get update \
&& curl --silent -L --output /tmp/geoipupdate_${GEOIP_UPDATER_VERSION}_linux_${TARGETARCH}.deb https://github.com/maxmind/geoipupdate/releases/download/v${GEOIP_UPDATER_VERSION}/geoipupdate_${GEOIP_UPDATER_VERSION}_linux_${TARGETARCH}.deb \
Expand Down
48 changes: 27 additions & 21 deletions docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
variable "IMAGE_NAME" {
default = "tecnativa/doodba"
default = "tecnativa/doodba"

@pedrobaeza pedrobaeza Oct 2, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why the indentantion changes?

@david-banon-tecnativa david-banon-tecnativa Oct 2, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Auto formatting, pre-commit doesn't handle hcl files, but the hcl plugin on vscode does.

}
variable "VERSIONS" {
default = ["11.0", "12.0", "13.0","14.0","15.0","16.0","17.0","18.0","19.0","20.0"]
type = list(string)
default = ["11.0", "12.0", "13.0","14.0","15.0","16.0","17.0","18.0","19.0","20.0"]
}
variable "SUFFIX" {
default = ""
variable "TAG_SUFFIX" {
default = ""
}
variable "VARIANTS" {
default = ["base", "onbuild"]
default = [{"target":"base", "tag":""}, {"target": "onbuild", "tag":"-onbuild"}]
}
variable "CI_SKIP_VERSIONS" {
default = ["11.0","12.0"]
}
group "default" {
targets = [
targets = [
"onbuild-${ODOO_VERSION}",
"base-${ODOO_VERSION}"
]
Expand All @@ -25,33 +26,38 @@ variable "ODOO_VERSION" {
variable "PLATFORMS" {
default = ""
}
variable "REGISTRIES" {
default = ["ghcr.io","docker.io"]
}
group "all" {
targets = flatten([
targets = flatten([
for version in VERSIONS : [
for variant in VARIANTS :
"${variant}-${replace(version, ".0", "")}"
"${variant.target}-${replace(version, ".0", "")}"
]
])
}

group "ci" {
targets = flatten([
targets = flatten([
for version in setsubtract(VERSIONS, CI_SKIP_VERSIONS) : [
for variant in VARIANTS :
"${variant}-${replace(version, ".0", "")}"
"${variant.target}-${replace(version, ".0", "")}"
]
])
}
target "doodba" {
matrix = {
version = VERSIONS
variant = ["base", "onbuild"]
}
name = "${variant}-${replace(version, ".0", "")}"
tags = [
"${IMAGE_NAME}:${version}-${variant}${SUFFIX}"
]
context = "."
dockerfile = "${version}.Dockerfile"
platforms = split(",", PLATFORMS)
matrix = {
version = VERSIONS
variant = VARIANTS
}
name = "${variant.target}-${replace(version, ".0", "")}"
tags = [
for registry in REGISTRIES :
"${registry}/${IMAGE_NAME}:${version}${variant.tag}${TAG_SUFFIX}"
]
target = variant.target
context = "."
dockerfile = "${version}.Dockerfile"
platforms = split(",", PLATFORMS)
}
Loading