Odoo: Add odoo 15.0 #11053
Merged
Odoo: Add odoo 15.0 #11053
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* add odoo 15.0 * remove 12.0 * update 13.0-14.0 to release 20211007
Diff for 7fe7a17:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 0f95169..aa4369d 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,12 +1,12 @@
Maintainers: Christophe Monniez <moc@odoo.com> (@d-fence)
GitRepo: https://github.com/odoo/docker
-GitCommit: 4f79a47adddee4538ab5d89624e3b6b7c600156f
-
-Tags: 12.0, 12
-Directory: 12.0
+GitCommit: e6d26592e68f0cdad2e391441255761b3638144c
Tags: 13.0, 13
Directory: 13.0
-Tags: 14.0, 14, latest
+Tags: 14.0, 14
Directory: 14.0
+
+Tags: 15.0, 15, latest
+Directory: 15.0
diff --git a/_bashbrew-list b/_bashbrew-list
index 12c8b2c..a2a5050 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,7 @@
-odoo:12
-odoo:12.0
odoo:13
odoo:13.0
odoo:14
odoo:14.0
+odoo:15
+odoo:15.0
odoo:latest
diff --git a/odoo_13/Dockerfile b/odoo_13/Dockerfile
index 07420c0..8a2533b 100644
--- a/odoo_13/Dockerfile
+++ b/odoo_13/Dockerfile
@@ -54,8 +54,8 @@ RUN npm install -g rtlcss
# Install Odoo
ENV ODOO_VERSION 13.0
-ARG ODOO_RELEASE=20211006
-ARG ODOO_SHA=b3545e9d1a28c5955c3fc95d5dbe726807ed70f6
+ARG ODOO_RELEASE=20211007
+ARG ODOO_SHA=5761202ca3dea1f89ad2e67a0f4111c5291f20e3
RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
&& echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \
&& apt-get update \
diff --git a/odoo_12/Dockerfile b/odoo_14/Dockerfile
similarity index 32%
rename from odoo_12/Dockerfile
rename to odoo_14/Dockerfile
index 71a82d8..3a2186f 100644
--- a/odoo_12/Dockerfile
+++ b/odoo_14/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch-slim
+FROM debian:buster-slim
MAINTAINER Odoo S.A. <info@odoo.com>
SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
@@ -6,20 +6,19 @@ SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
# Generate locale C.UTF-8 for postgres and general locale data
ENV LANG C.UTF-8
-# Use backports to avoid install some libs with pip
-RUN echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/backports.list
-
# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
-RUN apt-get update \
- && apt-get install -y --no-install-recommends \
+RUN apt-get update && \
+ apt-get install -y --no-install-recommends \
ca-certificates \
curl \
dirmngr \
fonts-noto-cjk \
gnupg \
- libssl1.0-dev \
+ libssl-dev \
node-less \
+ npm \
python3-num2words \
+ python3-pdfminer \
python3-pip \
python3-phonenumbers \
python3-pyldap \
@@ -32,13 +31,13 @@ RUN apt-get update \
python3-xlrd \
python3-xlwt \
xz-utils \
- && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \
- && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \
+ && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.buster_amd64.deb \
+ && echo 'ea8277df4297afc507c61122f3c349af142f31e5 wkhtmltox.deb' | sha1sum -c - \
&& apt-get install -y --no-install-recommends ./wkhtmltox.deb \
&& rm -rf /var/lib/apt/lists/* wkhtmltox.deb
# install latest postgresql-client
-RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
+RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
&& GNUPGHOME="$(mktemp -d)" \
&& export GNUPGHOME \
&& repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
@@ -51,24 +50,13 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc
&& rm -f /etc/apt/sources.list.d/pgdg.list \
&& rm -rf /var/lib/apt/lists/*
-# Install rtlcss (on Debian stretch)
-RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/nodesource.list \
- && GNUPGHOME="$(mktemp -d)" \
- && export GNUPGHOME \
- && repokey='9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280' \
- && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
- && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/nodejs.gpg.asc \
- && gpgconf --kill all \
- && rm -rf "$GNUPGHOME" \
- && apt-get update \
- && apt-get install --no-install-recommends -y nodejs \
- && npm install -g rtlcss \
- && rm -rf /var/lib/apt/lists/*
+# Install rtlcss (on Debian buster)
+RUN npm install -g rtlcss
# Install Odoo
-ENV ODOO_VERSION 12.0
-ARG ODOO_RELEASE=20211006
-ARG ODOO_SHA=f32dcd82b04e9a93e17a7d4b3ab471dc20408253
+ENV ODOO_VERSION 14.0
+ARG ODOO_RELEASE=20211007
+ARG ODOO_SHA=183bc4f2d640b53d5e2fb8fc06a1915a432c9ac7
RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
&& echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \
&& apt-get update \
@@ -79,7 +67,7 @@ RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/od
COPY ./entrypoint.sh /
COPY ./odoo.conf /etc/odoo/
-# Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons
+# Set permissions and Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons
RUN chown odoo /etc/odoo/odoo.conf \
&& mkdir -p /mnt/extra-addons \
&& chown -R odoo /mnt/extra-addons
diff --git a/odoo_12/entrypoint.sh b/odoo_14/entrypoint.sh
similarity index 100%
rename from odoo_12/entrypoint.sh
rename to odoo_14/entrypoint.sh
diff --git a/odoo_12/odoo.conf b/odoo_14/odoo.conf
similarity index 100%
rename from odoo_12/odoo.conf
rename to odoo_14/odoo.conf
diff --git a/odoo_12/wait-for-psql.py b/odoo_14/wait-for-psql.py
similarity index 100%
rename from odoo_12/wait-for-psql.py
rename to odoo_14/wait-for-psql.py
diff --git a/odoo_latest/Dockerfile b/odoo_latest/Dockerfile
index 149a180..6cff9a8 100644
--- a/odoo_latest/Dockerfile
+++ b/odoo_latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
MAINTAINER Odoo S.A. <info@odoo.com>
SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
@@ -14,6 +14,8 @@ RUN apt-get update && \
dirmngr \
fonts-noto-cjk \
gnupg \
+ # TO REEMOVE WHEN PACKAGED
+ gsfonts \
libssl-dev \
node-less \
npm \
@@ -22,6 +24,8 @@ RUN apt-get update && \
python3-pip \
python3-phonenumbers \
python3-pyldap \
+ # TO REMOVE WHEN PACKAGED
+ python3-openssl \
python3-qrcode \
python3-renderpm \
python3-setuptools \
@@ -37,7 +41,7 @@ RUN apt-get update && \
&& rm -rf /var/lib/apt/lists/* wkhtmltox.deb
# install latest postgresql-client
-RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
+RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
&& GNUPGHOME="$(mktemp -d)" \
&& export GNUPGHOME \
&& repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
@@ -54,9 +58,9 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/
RUN npm install -g rtlcss
# Install Odoo
-ENV ODOO_VERSION 14.0
-ARG ODOO_RELEASE=20211006
-ARG ODOO_SHA=468f467ce89e39b9aa735bbc70412000bd99b2c2
+ENV ODOO_VERSION 15.0
+ARG ODOO_RELEASE=20211007
+ARG ODOO_SHA=aee026f813f334400aa49dc857d4043719f8f395
RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
&& echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \
&& apt-get update \
|
+ # TO REMOVE WHEN PACKAGEDIs this intentional? (It's not a blocker, but I want to make sure it wasn't something that was left in accidentally.) |
Yes, it's intentional. This is a quickfix for an oversight in deb packaging. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hello ,
I'm sorry to come with a pull request so close from the previous one.
Here comes the new Odoo version 15.0.
Thanks for your understanding.