Skip to content
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.

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

[IMP] Odoo 15.0-17.0: improve deprecated keywords #512

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
10 changes: 6 additions & 4 deletions 15.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# syntax=docker/dockerfile:1

FROM debian:bullseye-slim
MAINTAINER Odoo S.A. <[email protected]>
LABEL vendor="Odoo S.A. <[email protected]>"

SHELL ["/bin/bash", "-xo", "pipefail", "-c"]

# Generate locale C.UTF-8 for postgres and general locale data
ENV LANG C.UTF-8
ENV LANG="C.UTF-8"

# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
RUN apt-get update && \
Expand Down Expand Up @@ -54,7 +56,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' > /et
RUN npm install -g rtlcss

# Install Odoo
ENV ODOO_VERSION 15.0
ENV ODOO_VERSION=15.0
ARG ODOO_RELEASE=20240711
ARG ODOO_SHA=32aa2460ab3a2a539e3e99e791592db2ab2a8406
RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
Expand All @@ -77,7 +79,7 @@ VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
EXPOSE 8069 8071 8072

# Set the default config file
ENV ODOO_RC /etc/odoo/odoo.conf
ENV ODOO_RC=/etc/odoo/odoo.conf

COPY wait-for-psql.py /usr/local/bin/wait-for-psql.py

Expand Down
10 changes: 6 additions & 4 deletions 16.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# syntax=docker/dockerfile:1

FROM debian:bullseye-slim
MAINTAINER Odoo S.A. <[email protected]>
LABEL vendor="Odoo S.A. <[email protected]>"

SHELL ["/bin/bash", "-xo", "pipefail", "-c"]

# Generate locale C.UTF-8 for postgres and general locale data
ENV LANG C.UTF-8
ENV LANG="C.UTF-8"

# Retrieve the target architecture to install the correct wkhtmltopdf package
ARG TARGETARCH
Expand Down Expand Up @@ -68,7 +70,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' > /et
RUN npm install -g rtlcss

# Install Odoo
ENV ODOO_VERSION 16.0
ENV ODOO_VERSION=16.0
ARG ODOO_RELEASE=20240711
ARG ODOO_SHA=0d16aea37be116a0fd07fc13c9c29a244737b419
RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
Expand All @@ -91,7 +93,7 @@ VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
EXPOSE 8069 8071 8072

# Set the default config file
ENV ODOO_RC /etc/odoo/odoo.conf
ENV ODOO_RC=/etc/odoo/odoo.conf

COPY wait-for-psql.py /usr/local/bin/wait-for-psql.py

Expand Down
10 changes: 6 additions & 4 deletions 17.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# syntax=docker/dockerfile:1

FROM ubuntu:jammy
MAINTAINER Odoo S.A. <[email protected]>
LABEL vendor="Odoo S.A. <[email protected]>"

SHELL ["/bin/bash", "-xo", "pipefail", "-c"]

# Generate locale C.UTF-8 for postgres and general locale data
ENV LANG en_US.UTF-8
ENV LANG="en_US.UTF-8"

# Retrieve the target architecture to install the correct wkhtmltopdf package
ARG TARGETARCH
Expand Down Expand Up @@ -70,7 +72,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main' > /etc/a
RUN npm install -g rtlcss

# Install Odoo
ENV ODOO_VERSION 17.0
ENV ODOO_VERSION=17.0
ARG ODOO_RELEASE=20240711
ARG ODOO_SHA=48a1ea9f9e6cf3d4913234c674cccd8c875a9aa4
RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
Expand All @@ -93,7 +95,7 @@ VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
EXPOSE 8069 8071 8072

# Set the default config file
ENV ODOO_RC /etc/odoo/odoo.conf
ENV ODOO_RC=/etc/odoo/odoo.conf

COPY wait-for-psql.py /usr/local/bin/wait-for-psql.py

Expand Down