[IMP] Odoo 15.0-17.0: improve deprecated keywords
This commit is contained in:
parent
c8297f5332
commit
2cb09cb8d3
@ -1,10 +1,12 @@
|
|||||||
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
FROM debian:bullseye-slim
|
FROM debian:bullseye-slim
|
||||||
MAINTAINER Odoo S.A. <info@odoo.com>
|
LABEL vendor="Odoo S.A. <info@odoo.com>"
|
||||||
|
|
||||||
SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
|
SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
|
||||||
|
|
||||||
# Generate locale C.UTF-8 for postgres and general locale data
|
# 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
|
# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
@ -54,7 +56,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' > /et
|
|||||||
RUN npm install -g rtlcss
|
RUN npm install -g rtlcss
|
||||||
|
|
||||||
# Install Odoo
|
# Install Odoo
|
||||||
ENV ODOO_VERSION 15.0
|
ENV ODOO_VERSION=15.0
|
||||||
ARG ODOO_RELEASE=20240711
|
ARG ODOO_RELEASE=20240711
|
||||||
ARG ODOO_SHA=32aa2460ab3a2a539e3e99e791592db2ab2a8406
|
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 \
|
RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
|
||||||
@ -77,7 +79,7 @@ VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
|
|||||||
EXPOSE 8069 8071 8072
|
EXPOSE 8069 8071 8072
|
||||||
|
|
||||||
# Set the default config file
|
# 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
|
COPY wait-for-psql.py /usr/local/bin/wait-for-psql.py
|
||||||
|
|
||||||
|
@ -1,10 +1,12 @@
|
|||||||
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
FROM debian:bullseye-slim
|
FROM debian:bullseye-slim
|
||||||
MAINTAINER Odoo S.A. <info@odoo.com>
|
LABEL vendor="Odoo S.A. <info@odoo.com>"
|
||||||
|
|
||||||
SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
|
SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
|
||||||
|
|
||||||
# Generate locale C.UTF-8 for postgres and general locale data
|
# 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
|
# Retrieve the target architecture to install the correct wkhtmltopdf package
|
||||||
ARG TARGETARCH
|
ARG TARGETARCH
|
||||||
@ -68,7 +70,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' > /et
|
|||||||
RUN npm install -g rtlcss
|
RUN npm install -g rtlcss
|
||||||
|
|
||||||
# Install Odoo
|
# Install Odoo
|
||||||
ENV ODOO_VERSION 16.0
|
ENV ODOO_VERSION=16.0
|
||||||
ARG ODOO_RELEASE=20240711
|
ARG ODOO_RELEASE=20240711
|
||||||
ARG ODOO_SHA=0d16aea37be116a0fd07fc13c9c29a244737b419
|
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 \
|
RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
|
||||||
@ -91,7 +93,7 @@ VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
|
|||||||
EXPOSE 8069 8071 8072
|
EXPOSE 8069 8071 8072
|
||||||
|
|
||||||
# Set the default config file
|
# 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
|
COPY wait-for-psql.py /usr/local/bin/wait-for-psql.py
|
||||||
|
|
||||||
|
@ -1,10 +1,12 @@
|
|||||||
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
FROM ubuntu:jammy
|
FROM ubuntu:jammy
|
||||||
MAINTAINER Odoo S.A. <info@odoo.com>
|
LABEL vendor="Odoo S.A. <info@odoo.com>"
|
||||||
|
|
||||||
SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
|
SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
|
||||||
|
|
||||||
# Generate locale C.UTF-8 for postgres and general locale data
|
# 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
|
# Retrieve the target architecture to install the correct wkhtmltopdf package
|
||||||
ARG TARGETARCH
|
ARG TARGETARCH
|
||||||
@ -70,7 +72,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main' > /etc/a
|
|||||||
RUN npm install -g rtlcss
|
RUN npm install -g rtlcss
|
||||||
|
|
||||||
# Install Odoo
|
# Install Odoo
|
||||||
ENV ODOO_VERSION 17.0
|
ENV ODOO_VERSION=17.0
|
||||||
ARG ODOO_RELEASE=20240711
|
ARG ODOO_RELEASE=20240711
|
||||||
ARG ODOO_SHA=48a1ea9f9e6cf3d4913234c674cccd8c875a9aa4
|
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 \
|
RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
|
||||||
@ -93,7 +95,7 @@ VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
|
|||||||
EXPOSE 8069 8071 8072
|
EXPOSE 8069 8071 8072
|
||||||
|
|
||||||
# Set the default config file
|
# 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
|
COPY wait-for-psql.py /usr/local/bin/wait-for-psql.py
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user