From d069d03dcff679146428d7ca6164e7df15c7ffbf Mon Sep 17 00:00:00 2001 From: Colin Newell Date: Thu, 10 Mar 2016 10:21:18 +0000 Subject: [PATCH] Revert "Parametize language" This reverts commit dceb4e4c4ebc6f79edeab008e1a8207b4399eb08. Removed temporarily because quay.io doesn't appear to support ARG. --- 8.0/Dockerfile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/8.0/Dockerfile b/8.0/Dockerfile index 14c054d..335b1a1 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -55,13 +55,10 @@ COPY ./entrypoint.sh / COPY ./openerp-server.conf /etc/odoo/ RUN chown odoo /etc/odoo/openerp-server.conf -ARG language=en_GB:en -ARG lang=en_GB.UTF-8 - -RUN locale-gen ${lang} -ENV LANG ${lang} -ENV LANGUAGE ${language} -ENV LC_ALL ${lang} +RUN locale-gen en_GB.UTF-8 +ENV LANG en_GB.UTF-8 +ENV LANGUAGE en_GB:en +ENV LC_ALL en_GB.UTF-8 # Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons RUN mkdir -p /mnt/extra-addons \