diff --git a/Dockerfile b/10.0.Dockerfile
similarity index 99%
rename from Dockerfile
rename to 10.0.Dockerfile
index b2a7d08ccf2c759b819d967ce229da7f47143b12..d9b97d8c48fb0ebec985972c52a11805d8745b9a 100644
--- a/Dockerfile
+++ b/10.0.Dockerfile
@@ -12,7 +12,6 @@ RUN set -x; \
curl \
fontconfig \
git \
- node-less \
libjpeg62-turbo \
libtiff5 \
libx11-6 \
diff --git a/12.0.Dockerfile b/12.0.Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..a6e3d5b89b6a804232ffd51709292ef80771ce24
--- /dev/null
+++ b/12.0.Dockerfile
@@ -0,0 +1,94 @@
+FROM debian:stretch
+MAINTAINER Le Filament <https://le-filament.com>
+
+# Generate locale C.UTF-8 for postgres and general locale data
+ENV LANG C.UTF-8
+ENV APT_DEPS='build-essential libldap2-dev libsasl2-dev python3-dev python3-wheel'
+#ENV APT_DEPS_EXTENDED='binutils build-essential bzip2 cpp cpp-6 dpkg-dev g++ g++-6 gcc gcc-6 libasan3 libatomic1 libc-dev-bin libc6-dev libcc1-0 libcilkrts5 libdpkg-perl libexpat1-dev libgcc-6-dev libgomp1 libisl15 libitm1 libldap2-dev libsasl2-dev liblsan0 libmpc3 libmpfr4 libmpx2 libpython3-dev libpython3.5 libpython3.5-dev libquadmath0 libstdc++-6-dev libtsan0 libubsan0 linux-libc-dev make patch python3-dev python3-wheel python3.5-dev'
+
+# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
+RUN set -x; \
+ apt-get update \
+ && apt-get install -y --no-install-recommends \
+ ca-certificates \
+ curl \
+ fontconfig \
+ git \
+ libssl1.0-dev \
+ libx11-6 \
+ libxcb1 \
+ libxext6 \
+ libxrender1 \
+ node-less \
+ postgresql-client \
+ python3-pip \
+ python3-pyldap \
+ python3-qrcode \
+ python3-renderpm \
+ python3-setuptools \
+ python3-vobject \
+ python3-watchdog \
+ xfonts-75dpi \
+ xfonts-base \
+ xz-utils \
+ && \
+# libfontconfig1 fontconfig-config libx11-data libxau6 libxdmcp6 xfonts-utils ucf fonts-dejavu-core libfontenc1 libxfont1 x11-common xfonts-encodings \
+# python3 python3-babel python3-dateutil python3-decorator python3-docutils python3-feedparser python3-imaging python3-jinja2 python3-ldap python3-libxslt1 python3-lxml python3-mako python3-mock python3-openid python3-passlib python3-psutil python3-psycopg2 python3-pychart python3-pydot python3-pyparsing python3-pypdf python3-reportlab python3-requests python3-suds python3-tz python3-vatnumber python3-vobject python3-werkzeug python3-xlsxwriter python3-xlwt python3-yaml python3-gevent\
+ curl -o wkhtmltox.deb -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb &&\
+ echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - &&\
+ dpkg --force-depends -i wkhtmltox.deb &&\
+ apt-get install -y --no-install-recommends ${APT_DEPS} &&\
+ pip3.5 install -I -r https://raw.githubusercontent.com/OCA/OCB/12.0/requirements.txt &&\
+ pip3.5 install simplejson WTForms &&\
+ apt-get -y purge ${APT_DEPS} &&\
+ apt-get -y autoremove &&\
+ rm -rf /var/lib/apt/lists/* wkhtmltox.deb
+
+# Install Odoo and remove not French translations and .git directory to limit amount of data used by container
+RUN set -x; \
+ useradd --create-home --home-dir /opt/odoo --no-log-init odoo && \
+ /bin/bash -c "mkdir -p /opt/odoo/{etc,odoo,additional_addons,private_addons,data,private}" &&\
+ git clone -b 12.0 --depth 1 https://github.com/OCA/OCB.git /opt/odoo/odoo &&\
+ rm -rf /opt/odoo/odoo/.git &&\
+ find /opt/odoo/odoo/addons/*/i18n/ /opt/odoo/odoo/odoo/addons/base/i18n/ -type f -not -name 'fr.po' -delete &&\
+ chown -R odoo:odoo /opt/odoo
+
+# Install Odoo OCA default dependencies
+RUN set -x; \
+ mkdir -p /tmp/oca-repos/ &&\
+ git clone -b 12.0 --depth 1 https://github.com/OCA/account-financial-reporting.git /tmp/oca-repos/account-financial-reporting &&\
+ mv /tmp/oca-repos/account-financial-reporting/account_tax_balance /opt/odoo/additional_addons/ &&\
+ git clone -b 12.0 --depth 1 https://github.com/OCA/partner-contact.git /tmp/oca-repos/partner-contact &&\
+ mv /tmp/oca-repos/partner-contact/partner_firstname /opt/odoo/additional_addons/ &&\
+ rm -rf /tmp/oca-repos/ &&\
+ find /opt/odoo/additional_addons/*/i18n/ -type f -not -name 'fr.po' -delete &&\
+ chown -R odoo:odoo /opt/odoo
+
+# Copy entrypoint script and Odoo configuration file
+COPY ./entrypoint.sh /
+COPY ./odoo.conf /opt/odoo/etc/odoo.conf
+RUN chown odoo:odoo /opt/odoo/etc/odoo.conf
+
+# Mount /opt/odoo/data to allow restoring filestore
+VOLUME ["/opt/odoo/data/"]
+
+# Expose Odoo services
+EXPOSE 8069
+
+# Set default user when running the container
+USER odoo
+
+# Start
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["odoo"]
+
+# Metadata
+ARG VCS_REF
+ARG BUILD_DATE
+ARG VERSION
+LABEL org.label-schema.schema-version="$VERSION" \
+ org.label-schema.vendor=LeFilament \
+ org.label-schema.license=Apache-2.0 \
+ org.label-schema.build-date="$BUILD_DATE" \
+ org.label-schema.vcs-ref="$VCS_REF" \
+ org.label-schema.vcs-url="https://github.com/lefilament/docker-odoo"
diff --git a/hooks/build b/hooks/build
index 46a7427956761ff996d8b9a6e8b3b1bb5f84b066..f7d2d38eddd564b22bb0902d5640f21bf6632124 100644
--- a/hooks/build
+++ b/hooks/build
@@ -1,10 +1,20 @@
#!/bin/bash
set -ex
+# Get Odoo version
+version="$DOCKER_TAG"
+if [ "$version" == latest ]; then
+ version=12.0
+fi
+
+if [ -z "$IMAGE_NAME" ]; then
+ IMAGE_NAME="$DOCKER_REPO:$DOCKER_TAG"
+fi
+
time docker image build \
--build-arg VCS_REF="$GIT_SHA1" \
--build-arg BUILD_DATE="$(date --rfc-3339 ns)" \
- --build-arg ODOO_VERSION="10.0" \
- --file "Dockerfile" \
- --tag "remifilament/odoo:10.0" \
+ --build-arg ODOO_VERSION="$version" \
+ --file "$version.Dockerfile" \
+ --tag "$IMAGE_NAME" \
.
diff --git a/hooks/post_push b/hooks/post_push
index cec5b888b0e3cb4cd40686febd1b4e816cff04a6..9e0cdc2a022992136bc51ffe557d057141421c84 100644
--- a/hooks/post_push
+++ b/hooks/post_push
@@ -1,4 +1,14 @@
#!/bin/bash
set -ex
-docker image push "remifilament/odoo:10.0"
+# Get Odoo version
+version="$DOCKER_TAG"
+if [ "$version" == latest ]; then
+ version=12.0
+fi
+
+if [ -z "$IMAGE_NAME" ]; then
+ IMAGE_NAME="$DOCKER_REPO:$DOCKER_TAG"
+fi
+
+docker image push "$IMAGE_NAME"