diff --git a/12.0.Dockerfile b/12.0.Dockerfile index f744d72455ee0c9ed05af85a6085cc595503b51c..8263d66d63c5983ea4de6eef87e82f0c37776c9b 100644 --- a/12.0.Dockerfile +++ b/12.0.Dockerfile @@ -118,7 +118,7 @@ RUN set -x; \ /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 + chown -R odoo:odoo /opt/odoo # Copy entrypoint script and Odoo configuration file COPY ./entrypoint.sh / @@ -139,12 +139,7 @@ ENTRYPOINT ["/entrypoint.sh"] CMD ["odoo"] # Metadata -ARG VCS_REF -ARG BUILD_DATE -ARG VERSION -LABEL org.label-schema.schema-version="$VERSION" \ +LABEL org.label-schema.schema-version="12.0" \ 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" + org.label-schema.vcs-url="https://sources.le-filament.com/lefilament/odoo_docker" diff --git a/12.0.Dockerfile.arm b/12.0.Dockerfile.arm index 252c958c0a792af6087752735832e95a7d749974..6d8b5c5e41890b46cd1ddf2f28618d36cc66031c 100644 --- a/12.0.Dockerfile.arm +++ b/12.0.Dockerfile.arm @@ -6,8 +6,8 @@ ENV APT_DEPS='build-essential libldap2-dev libpq-dev libxml2-dev zlib1g-dev libx LC_ALL=C.UTF-8 \ PGDATABASE=odoo -RUN set -x; \ - apt-get update &&\ +RUN set -x; \ + apt-get update &&\ apt-get install -y --no-install-recommends \ ca-certificates \ curl \ @@ -34,20 +34,20 @@ RUN set -x; \ xfonts-75dpi \ xfonts-base \ xz-utils \ - && \ - echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' >> /etc/apt/sources.list.d/postgresql.list && \ - curl -SL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \ - curl -o wkhtmltox.deb -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.raspbian.stretch_armhf.deb && \ - seq 1 8 | xargs -I{} mkdir -p /usr/share/man/man{} && \ - apt-get update && \ - apt-get install -y --no-install-recommends ./wkhtmltox.deb && \ - apt-get install -y --no-install-recommends postgresql-client && \ - apt-get install -y --no-install-recommends ${APT_DEPS} && \ + && \ + echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' >> /etc/apt/sources.list.d/postgresql.list && \ + curl -SL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \ + curl -o wkhtmltox.deb -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.raspbian.stretch_armhf.deb && \ + seq 1 8 | xargs -I{} mkdir -p /usr/share/man/man{} && \ + apt-get update && \ + apt-get install -y --no-install-recommends ./wkhtmltox.deb && \ + apt-get install -y --no-install-recommends postgresql-client && \ + apt-get install -y --no-install-recommends ${APT_DEPS} && \ curl https://bootstrap.pypa.io/pip/3.5/get-pip.py | python3 /dev/stdin &&\ - pip install -I -r https://raw.githubusercontent.com/OCA/OCB/12.0/requirements.txt && \ - pip install simplejson WTForms zxcvbn phonenumbers Werkzeug==0.14.1 python3-openid netbluemind && \ - apt-get -y purge ${APT_DEPS} && \ - apt-get -y autoremove && \ + pip install -I -r https://raw.githubusercontent.com/OCA/OCB/12.0/requirements.txt && \ + pip install simplejson WTForms zxcvbn phonenumbers Werkzeug==0.14.1 python3-openid netbluemind && \ + apt-get -y purge ${APT_DEPS} && \ + apt-get -y autoremove && \ rm -rf /var/lib/apt/lists/* wkhtmltox.deb # Add Git Known Hosts @@ -142,12 +142,7 @@ ENTRYPOINT ["/entrypoint.sh"] CMD ["odoo"] # Metadata -ARG VCS_REF -ARG BUILD_DATE -ARG VERSION -LABEL org.label-schema.schema-version="$VERSION" \ +LABEL org.label-schema.schema-version="12.0" \ 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" + org.label-schema.vcs-url="https://sources.le-filament.com/lefilament/odoo_docker" diff --git a/12.0_ml.Dockerfile b/12.0_ml.Dockerfile index 16fdb3be07a506379283ec69e205ed1a75502392..609c3709603416bbbfc5a92ab2cf9e478f07ce6e 100644 --- a/12.0_ml.Dockerfile +++ b/12.0_ml.Dockerfile @@ -116,7 +116,7 @@ RUN set -x; \ /tmp/oca-repos/web/web_timeline \ /opt/odoo/additional_addons/ &&\ rm -rf /tmp/oca-repos/ &&\ - chown -R odoo:odoo /opt/odoo + chown -R odoo:odoo /opt/odoo # Copy entrypoint script and Odoo configuration file COPY ./entrypoint.sh / @@ -137,12 +137,7 @@ ENTRYPOINT ["/entrypoint.sh"] CMD ["odoo"] # Metadata -ARG VCS_REF -ARG BUILD_DATE -ARG VERSION -LABEL org.label-schema.schema-version="$VERSION" \ +LABEL org.label-schema.schema-version="12.0_ml" \ 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" + org.label-schema.vcs-url="https://sources.le-filament.com/lefilament/odoo_docker" diff --git a/12.0_py3.6.Dockerfile b/12.0_py3.6.Dockerfile index 403c84c9e0e9617d3f034509d96857595c9a11dd..1a5b7de51c19738e7d8949dc87a14556b442e1d1 100644 --- a/12.0_py3.6.Dockerfile +++ b/12.0_py3.6.Dockerfile @@ -101,7 +101,7 @@ RUN set -x; \ /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 + chown -R odoo:odoo /opt/odoo # Copy entrypoint script and Odoo configuration file COPY ./entrypoint.sh / @@ -122,12 +122,7 @@ ENTRYPOINT ["/entrypoint.sh"] CMD ["odoo"] # Metadata -ARG VCS_REF -ARG BUILD_DATE -ARG VERSION -LABEL org.label-schema.schema-version="$VERSION" \ +LABEL org.label-schema.schema-version="12.0_py3.6" \ 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" + org.label-schema.vcs-url="https://sources.le-filament.com/lefilament/odoo_docker"