Open-Harbor/docker-odoo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Reidented. Sorry, but I had to. There were 2-3 different indentations in

Browse Source 
the same file.
This commit is contained in:
Andris 2020-02-02 19:10:16 +01:00
parent 80e62cffad
commit ba98a8f056
3 changed files with 131 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
11.0/Dockerfile
View File

@ -11,53 +11,53 @@ RUN echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/so
# 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 \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
ca-certificates \ ca-certificates \
curl \ curl \
dirmngr \ dirmngr \
fonts-noto-cjk \ fonts-noto-cjk \
gnupg \ gnupg \
libssl1.0-dev \ libssl1.0-dev \
node-less \ node-less \
python3-num2words \ python3-num2words \
python3-pip \ python3-pip \
python3-phonenumbers \ python3-phonenumbers \
python3-pyldap \ python3-pyldap \
python3-qrcode \ python3-qrcode \
python3-renderpm \ python3-renderpm \
python3-setuptools \ python3-setuptools \
python3-slugify \ python3-slugify \
python3-vobject \ python3-vobject \
python3-watchdog \ python3-watchdog \
python3-xlrd \ python3-xlrd \
python3-xlwt \ python3-xlwt \
xz-utils \ 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 \ && 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 - \ && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \
&& apt-get install -y --no-install-recommends ./wkhtmltox.deb \ && apt-get install -y --no-install-recommends ./wkhtmltox.deb \
&& rm -rf /var/lib/apt/lists/* wkhtmltox.deb && rm -rf /var/lib/apt/lists/* wkhtmltox.deb
# install latest postgresql-client # 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/ stretch-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
&& export GNUPGHOME="$(mktemp -d)" \ && export GNUPGHOME="$(mktemp -d)" \
&& repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
&& gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \ && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \
&& gpgconf --kill all \ && gpgconf --kill all \
&& rm -rf "$GNUPGHOME" \ && rm -rf "$GNUPGHOME" \
&& apt-get update \ && apt-get update \
&& apt-get install -y postgresql-client \ && apt-get install -y postgresql-client \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Install Odoo # Install Odoo
ENV ODOO_VERSION 11.0 ENV ODOO_VERSION 11.0
ARG ODOO_RELEASE=20200121 ARG ODOO_RELEASE=20200121
ARG ODOO_SHA=13f30434cb4fb28b11d78fd4e7c616d03362f779 ARG ODOO_SHA=13f30434cb4fb28b11d78fd4e7c616d03362f779
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 \
&& echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \
&& apt-get update \ && apt-get update \
&& apt-get -y install --no-install-recommends ./odoo.deb\ && apt-get -y install --no-install-recommends ./odoo.deb\
&& rm -rf /var/lib/apt/lists/* odoo.deb && rm -rf /var/lib/apt/lists/* odoo.deb
# Copy entrypoint script and Odoo configuration file # Copy entrypoint script and Odoo configuration file
COPY ./entrypoint.sh / COPY ./entrypoint.sh /
@ -65,8 +65,8 @@ COPY ./odoo.conf /etc/odoo/
# Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons # Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons
RUN chown odoo /etc/odoo/odoo.conf \ RUN chown odoo /etc/odoo/odoo.conf \
&& mkdir -p /mnt/extra-addons \ && mkdir -p /mnt/extra-addons \
&& chown -R odoo /mnt/extra-addons && chown -R odoo /mnt/extra-addons
VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
# Expose Odoo services # Expose Odoo services

100
12.0/Dockerfile
View File

@ -11,66 +11,66 @@ RUN echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/so
# 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 \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
ca-certificates \ ca-certificates \
curl \ curl \
dirmngr \ dirmngr \
fonts-noto-cjk \ fonts-noto-cjk \
gnupg \ gnupg \
libssl1.0-dev \ libssl1.0-dev \
node-less \ node-less \
python3-num2words \ python3-num2words \
python3-pip \ python3-pip \
python3-phonenumbers \ python3-phonenumbers \
python3-pyldap \ python3-pyldap \
python3-qrcode \ python3-qrcode \
python3-renderpm \ python3-renderpm \
python3-setuptools \ python3-setuptools \
python3-slugify \ python3-slugify \
python3-vobject \ python3-vobject \
python3-watchdog \ python3-watchdog \
python3-xlrd \ python3-xlrd \
python3-xlwt \ python3-xlwt \
xz-utils \ 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 \ && 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 - \ && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \
&& apt-get install -y --no-install-recommends ./wkhtmltox.deb \ && apt-get install -y --no-install-recommends ./wkhtmltox.deb \
&& rm -rf /var/lib/apt/lists/* wkhtmltox.deb && rm -rf /var/lib/apt/lists/* wkhtmltox.deb
# install latest postgresql-client # 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/ stretch-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
&& export GNUPGHOME="$(mktemp -d)" \ && export GNUPGHOME="$(mktemp -d)" \
&& repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
&& gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \ && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \
&& gpgconf --kill all \ && gpgconf --kill all \
&& rm -rf "$GNUPGHOME" \ && rm -rf "$GNUPGHOME" \
&& apt-get update \ && apt-get update \
&& apt-get install -y postgresql-client \ && apt-get install -y postgresql-client \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Install rtlcss (on Debian stretch) # Install rtlcss (on Debian stretch)
RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/nodesource.list \ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/nodesource.list \
&& export GNUPGHOME="$(mktemp -d)" \ && export GNUPGHOME="$(mktemp -d)" \
&& repokey='9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280' \ && repokey='9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280' \
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
&& gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/nodejs.gpg.asc \ && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/nodejs.gpg.asc \
&& gpgconf --kill all \ && gpgconf --kill all \
&& rm -rf "$GNUPGHOME" \ && rm -rf "$GNUPGHOME" \
&& apt-get update \ && apt-get update \
&& apt-get install -y nodejs \ && apt-get install -y nodejs \
&& npm install -g rtlcss \ && npm install -g rtlcss \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Install Odoo # Install Odoo
ENV ODOO_VERSION 12.0 ENV ODOO_VERSION 12.0
ARG ODOO_RELEASE=20200121 ARG ODOO_RELEASE=20200121
ARG ODOO_SHA=cb0bcb5d239983468c2e3b3f7cf17f58df820b1c ARG ODOO_SHA=cb0bcb5d239983468c2e3b3f7cf17f58df820b1c
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 \
&& echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \
&& apt-get update \ && apt-get update \
&& apt-get -y install --no-install-recommends ./odoo.deb \ && apt-get -y install --no-install-recommends ./odoo.deb \
&& rm -rf /var/lib/apt/lists/* odoo.deb && rm -rf /var/lib/apt/lists/* odoo.deb
# Copy entrypoint script and Odoo configuration file # Copy entrypoint script and Odoo configuration file
COPY ./entrypoint.sh / COPY ./entrypoint.sh /
@ -78,8 +78,8 @@ COPY ./odoo.conf /etc/odoo/
# Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons # Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons
RUN chown odoo /etc/odoo/odoo.conf \ RUN chown odoo /etc/odoo/odoo.conf \
&& mkdir -p /mnt/extra-addons \ && mkdir -p /mnt/extra-addons \
&& chown -R odoo /mnt/extra-addons && chown -R odoo /mnt/extra-addons
VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
# Expose Odoo services # Expose Odoo services

82
13.0/Dockerfile
View File

@ -8,44 +8,44 @@ 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 \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
ca-certificates \ ca-certificates \
curl \ curl \
dirmngr \ dirmngr \
fonts-noto-cjk \ fonts-noto-cjk \
gnupg \ gnupg \
libssl-dev \ libssl-dev \
node-less \ node-less \
npm \ npm \
python3-num2words \ python3-num2words \
python3-pip \ python3-pip \
python3-phonenumbers \ python3-phonenumbers \
python3-pyldap \ python3-pyldap \
python3-qrcode \ python3-qrcode \
python3-renderpm \ python3-renderpm \
python3-setuptools \ python3-setuptools \
python3-slugify \ python3-slugify \
python3-vobject \ python3-vobject \
python3-watchdog \ python3-watchdog \
python3-xlrd \ python3-xlrd \
python3-xlwt \ python3-xlwt \
xz-utils \ 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 \ && 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 - \ && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \
&& apt-get install -y --no-install-recommends ./wkhtmltox.deb \ && apt-get install -y --no-install-recommends ./wkhtmltox.deb \
&& rm -rf /var/lib/apt/lists/* wkhtmltox.deb && rm -rf /var/lib/apt/lists/* wkhtmltox.deb
# install latest postgresql-client # 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/ buster-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
&& export GNUPGHOME="$(mktemp -d)" \ && export GNUPGHOME="$(mktemp -d)" \
&& repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
&& gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \ && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \
&& gpgconf --kill all \ && gpgconf --kill all \
&& rm -rf "$GNUPGHOME" \ && rm -rf "$GNUPGHOME" \
&& apt-get update \ && apt-get update \
&& apt-get install -y postgresql-client \ && apt-get install -y postgresql-client \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Install rtlcss (on Debian buster) # Install rtlcss (on Debian buster)
RUN npm install -g rtlcss RUN npm install -g rtlcss
@ -55,10 +55,10 @@ ENV ODOO_VERSION 13.0
ARG ODOO_RELEASE=20200121 ARG ODOO_RELEASE=20200121
ARG ODOO_SHA=770d71cfafb9a8f8419b88f8033b964d5742ad57 ARG ODOO_SHA=770d71cfafb9a8f8419b88f8033b964d5742ad57
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 \
&& echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \ && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \
&& apt-get update \ && apt-get update \
&& apt-get -y install --no-install-recommends odoo.deb \ && apt-get -y install --no-install-recommends ./odoo.deb \
&& rm -rf /var/lib/apt/lists/* odoo.deb && rm -rf /var/lib/apt/lists/* odoo.deb
# Copy entrypoint script and Odoo configuration file # Copy entrypoint script and Odoo configuration file
COPY ./entrypoint.sh / COPY ./entrypoint.sh /
@ -66,8 +66,8 @@ COPY ./odoo.conf /etc/odoo/
# Set permissions and 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 \ RUN chown odoo /etc/odoo/odoo.conf \
&& mkdir -p /mnt/extra-addons \ && mkdir -p /mnt/extra-addons \
&& chown -R odoo /mnt/extra-addons && chown -R odoo /mnt/extra-addons
VOLUME ["/var/lib/odoo", "/mnt/extra-addons"] VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
# Expose Odoo services # Expose Odoo services