diff --git a/backups/rsyncvolumes/Dockerfile b/backups/rsyncvolumes/Dockerfile index 7479d27..b7f73a1 100644 --- a/backups/rsyncvolumes/Dockerfile +++ b/backups/rsyncvolumes/Dockerfile @@ -1,11 +1,10 @@ FROM debian:stretch -MAINTAINER Yaltik - Fabien Bourgeois - -ENV SOURCE /var/lib/docker/volumes -ENV DEST /var/backups/ +LABEL maintainer="Yaltik - Fabien Bourgeois " +ENV SOURCE="/var/lib/docker/volumes" DEST="/var/backups/" RUN apt-get update && apt-get install --no-install-recommends -y \ - cron gettext-base rsync ssh sshpass python-minimal libpython-stdlib + cron gettext-base rsync ssh sshpass python-minimal libpython-stdlib && \ + apt-get clean && rm -rf /var/lib/apt/lists/* # Avoid overlayfs bug with tail VOLUME /var/log @@ -17,4 +16,4 @@ COPY plan.py . COPY remote.py . COPY launch.sh . -CMD bash launch.sh +CMD ["bash", "launch.sh"] diff --git a/backups/rsyncvolumes/Dockerfile.c7 b/backups/rsyncvolumes/Dockerfile.c7 index f406830..8fc70bf 100644 --- a/backups/rsyncvolumes/Dockerfile.c7 +++ b/backups/rsyncvolumes/Dockerfile.c7 @@ -1,10 +1,9 @@ FROM oraclelinux:7 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " -ENV SOURCE /var/lib/docker/volumes -ENV DEST /var/backups/ +ENV SOURCE="/var/lib/docker/volumes" DEST="/var/backups/" -RUN yum -y install gettext rsync ssh sshpass cronie +RUN yum -y install gettext rsync ssh sshpass cronie && yum clean all # Avoid overlayfs bug with tail VOLUME /var/log @@ -16,4 +15,4 @@ COPY plan.py . COPY remote.py . COPY launch.c7.sh launch.sh -CMD bash launch.sh +CMD ["bash", "launch.sh"] diff --git a/caddy/Dockerfile b/caddy/Dockerfile index 52f352d..70b4442 100644 --- a/caddy/Dockerfile +++ b/caddy/Dockerfile @@ -1,5 +1,5 @@ FROM caddy:2-builder AS builder -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " RUN xcaddy build \ --with github.com/caddyserver/format-encoder \ diff --git a/netdata/Dockerfile b/netdata/Dockerfile index e3720b1..b657506 100644 --- a/netdata/Dockerfile +++ b/netdata/Dockerfile @@ -1,5 +1,5 @@ -FROM netdata/netdata -MAINTAINER Yaltik - Fabien Bourgeois +FROM netdata/netdata:stable +LABEL maintainer="Yaltik - Fabien Bourgeois " # Override default configuration COPY netdata.conf /netdata.conf diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 8f8991a..680eb0c 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -1,29 +1,17 @@ FROM nginx:stable -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # Default variables -ENV NGINX_HOST localhost 127.0.0.1 -ENV NGINX_PORT 8080 -ENV NGINX_SSL_PORT 8443 -ENV NGINX_EXTERNAL_PORT 80 -ENV NGINX_EXTERNAL_SSL_PORT 443 -ENV CERTIFICATE_PATH /etc/nginx/certs/req.pem -ENV CERTIFICATE_KEY_PATH /etc/nginx/certs/cert.key -ENV SSL_PROTOCOLS TLSv1.2 TLSv1.3 -ENV SSL_CIPHERS ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384 -ENV CLIENT_BODY_BUFFER_SIZE 1K -ENV CLIENT_HEADER_BUFFER_SIZE 1k -ENV CLIENT_MAX_BODY_SIZE 1k -ENV LARGE_CLIENT_HEADER_BUFFERS 4 8k +ENV NGINX_HOST="localhost 127.0.0.1" NGINX_PORT="8080" NGINX_SSL_PORT="8443" NGINX_EXTERNAL_PORT="80" NGINX_EXTERNAL_SSL_PORT="443" CERTIFICATE_PATH="/etc/nginx/certs/req.pem" CERTIFICATE_KEY_PATH="/etc/nginx/certs/cert.key" SSL_PROTOCOLS="TLSv1.2 TLSv1.3" SSL_CIPHERS="ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384" CLIENT_BODY_BUFFER_SIZE="1K" CLIENT_HEADER_BUFFER_SIZE="1k" CLIENT_MAX_BODY_SIZE="1k" LARGE_CLIENT_HEADER_BUFFERS="4 8k" +# Create usefull directories +RUN mkdir /etc/nginx/certs && mkdir /etc/nginx/templates # Create sensible CERTS -RUN mkdir /etc/nginx/certs COPY req.pem cert.key dhparams.pem /etc/nginx/certs/ # # Clean, copy templates and usefull files RUN rm /etc/nginx/conf.d/* COPY launch.sh /launch.sh -RUN mkdir /etc/nginx/templates COPY nginx.conf /etc/nginx/ COPY root.conf /etc/nginx/templates/ @@ -38,4 +26,4 @@ RUN touch /var/run/nginx.pid && \ USER nginx -CMD bash /launch.sh +CMD ["bash", "/launch.sh"] diff --git a/odoo/backups/Dockerfile b/odoo/backups/Dockerfile index 7d7adb9..d8ebc32 100644 --- a/odoo/backups/Dockerfile +++ b/odoo/backups/Dockerfile @@ -1,26 +1,23 @@ FROM registry.yaltik.net/odoocmd:yaltik -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " -ENV ODOO_ADMIN_PASSWORD admin -ENV ODOO_DATABASES demo +ENV ODOO_ADMIN_PASSWORD="admin" ODOO_DATABASES="demo" -WORKDIR /home/odoo USER root +RUN apt-get install -y --no-install-recommends cron gettext-base curl && \ + apt-get clean && rm -rf /var/lib/apt/lists/* -RUN mkdir backups -RUN apt-get install -y --no-install-recommends cron gettext-base curl +USER odoo +COPY crontab /home/odoo/ +COPY backup.template /home/odoo/ +COPY hc.template /home/odoo/ +COPY plan.py /home/odoo/ +COPY launch.sh /home/odoo/ + +RUN mkdir -p backups # Avoid overlayfs bug with tail VOLUME /var/log - -COPY crontab ./crontab - -COPY backup.template . -COPY hc.template . -COPY plan.py . -COPY launch.sh . - -RUN chown -R odoo:odoo . VOLUME /home/odoo/backups -CMD bash launch.sh +CMD ["bash", "launch.sh"] diff --git a/odoo/backups/Dockerfile.c7 b/odoo/backups/Dockerfile.c7 index 8f473d1..b4d96f5 100644 --- a/odoo/backups/Dockerfile.c7 +++ b/odoo/backups/Dockerfile.c7 @@ -1,26 +1,22 @@ FROM registry.yaltik.net/odoocmd:yaltikc7 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " -ENV ODOO_ADMIN_PASSWORD admin -ENV ODOO_DATABASES demo +ENV ODOO_ADMIN_PASSWORD="admin" ODOO_DATABASES="demo" -WORKDIR /home/odoo USER root +RUN yum install -y gettext cronie curl && yum clean all -RUN mkdir backups -RUN yum install -y gettext cronie curl +USER odoo +COPY crontab /home/odoo/ +COPY backup.template /home/odoo/ +COPY hc.template /home/odoo/ +COPY plan.py /home/odoo/ +COPY launch.c7.sh /home/odoo/ + +RUN mkdir -p backups # Avoid overlayfs bug with tail VOLUME /var/log - -COPY crontab ./crontab - -COPY backup.template . -COPY hc.template . -COPY plan.py . -COPY launch.c7.sh launch.sh - -RUN chown -R odoo:odoo . VOLUME /home/odoo/backups -CMD bash launch.sh +CMD ["bash", "launch.sh"] diff --git a/odoo/caddy/Dockerfile.dev b/odoo/caddy/Dockerfile.dev index b5f6911..8a778f6 100644 --- a/odoo/caddy/Dockerfile.dev +++ b/odoo/caddy/Dockerfile.dev @@ -1,9 +1,8 @@ FROM registry.yaltik.net/caddy:yaltik -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # Default variables -ENV ODOO_SERVICE odoo -ENV ODOO_SERVER_NAMES odoo +ENV ODOO_SERVICE="odoo" ODOO_SERVER_NAMES="odoo" # Configuration COPY Caddyfile /etc/caddy/Caddyfile diff --git a/odoo/golem/Dockerfile b/odoo/golem/Dockerfile index 5e387ba..e984878 100644 --- a/odoo/golem/Dockerfile +++ b/odoo/golem/Dockerfile @@ -1,8 +1,8 @@ FROM registry.yaltik.net/odoo:yaltik8c7 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # Extra dependency -RUN pip install --user unidecode==1.2.0 +RUN pip install --user --no-cache-dir unidecode==1.2.0 # External dependencies WORKDIR /opt/odoo/extra-addons @@ -13,6 +13,6 @@ RUN git clone --depth 1 -b 8.0 https://github.com/OCA/community-data-files \ # Custom code WORKDIR /opt/odoo/custom-addons -RUN git clone --depth 1 -b 8.0 https://git.yaltik.net/Yaltik/yaltik_odoo_custom.git yaltik -RUN git clone --depth 1 -b 2 https://git.yaltik.net/yaltik/golem.git golem +RUN git clone --depth 1 -b 8.0 https://git.yaltik.net/Yaltik/yaltik_odoo_custom.git yaltik && \ + git clone --depth 1 -b 2 https://git.yaltik.net/yaltik/golem.git golem WORKDIR /opt/odoo diff --git a/odoo/golem/Dockerfile.dev b/odoo/golem/Dockerfile.dev index 7272227..3d2b8bb 100644 --- a/odoo/golem/Dockerfile.dev +++ b/odoo/golem/Dockerfile.dev @@ -1,15 +1,15 @@ FROM registry.yaltik.net/odoodev:yaltik8c7 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # Extra dependency -RUN pip install --user unidecode==1.2.0 +RUN pip install --user --no-cache-dir unidecode==1.2.0 # External dependencies WORKDIR /opt/odoo/extra-addons RUN git clone --depth 1 -b 8.0 https://github.com/OCA/community-data-files \ && git clone --depth 1 -b 8.0 https://github.com/OCA/l10n-france \ && git clone --depth 1 -b 8.0 https://github.com/OCA/partner-contact \ - && git clone --depth 1 -b 8.0 https://github.com/OCA/vertical-association + && git clone --depth 1 -b 8.0 https://github.com/OCA/vertical-association && \ + mkdir /opt/odoo/custom-addons/yaltik && mkdir /opt/odoo/custom-addons/golem -RUN mkdir /opt/odoo/custom-addons/yaltik && mkdir /opt/odoo/custom-addons/golem WORKDIR /opt/odoo diff --git a/odoo/golem/Dockerfile.master b/odoo/golem/Dockerfile.master index 136c983..33f3498 100644 --- a/odoo/golem/Dockerfile.master +++ b/odoo/golem/Dockerfile.master @@ -1,5 +1,5 @@ FROM registry.yaltik.net/odoo:yaltik10c7 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # Extra addons WORKDIR /opt/odoo/extra-addons @@ -7,6 +7,6 @@ RUN git clone --depth 1 -b 10.0 https://github.com/OCA/vertical-association # Own GOLEM Code WORKDIR /opt/odoo/custom-addons -RUN git clone --depth 1 -b 10.0 https://git.yaltik.net/Yaltik/yaltik_odoo_custom.git yaltik -RUN git clone --depth 1 -b stable https://git.yaltik.net/yaltik/golem.git golem +RUN git clone --depth 1 -b 10.0 https://git.yaltik.net/Yaltik/yaltik_odoo_custom.git yaltik && \ + git clone --depth 1 -b stable https://git.yaltik.net/yaltik/golem.git golem WORKDIR /opt/odoo diff --git a/odoo/golem/Dockerfile.master.dev b/odoo/golem/Dockerfile.master.dev index e2fdad2..1fe8067 100644 --- a/odoo/golem/Dockerfile.master.dev +++ b/odoo/golem/Dockerfile.master.dev @@ -1,17 +1,16 @@ FROM registry.yaltik.net/golem:yaltikmaster -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # PostgreSQL CLI # Mandatory for pyhton2 # RUN pip install --user pgcli==2.2.0 --only-binary psycopg2 # COPY pgcli.sh ./ # Odoo specific -RUN pip install --user watchdog -RUN pip install --user ipython -RUN mkdir -p /opt/odoo/.ipython/profile_default -COPY ipython_config.py ./.ipython/profile_default/ -COPY shell_helpers.py ./ -COPY shell10.sh ./shell.sh -COPY i18n.sh ./ -COPY launch10.dev.sh ./launch10.sh +RUN pip install --user --no-cache-dir watchdog==0.10.7 ipython==5.10.0 && \ + mkdir -p /opt/odoo/.ipython/profile_default +COPY ipython_config.py /opt/odoo/.ipython/profile_default/ +COPY shell_helpers.py /opt/odoo/ +COPY shell10.sh /opt/odoo/shell.sh +COPY i18n.sh /opt/odoo/ +COPY launch10.dev.sh /opt/odoo/launch10.sh ENV DEV 1 diff --git a/odoo/golem/Dockerfile.v3 b/odoo/golem/Dockerfile.v3 index 136c983..62e4d9d 100644 --- a/odoo/golem/Dockerfile.v3 +++ b/odoo/golem/Dockerfile.v3 @@ -1,5 +1,5 @@ FROM registry.yaltik.net/odoo:yaltik10c7 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # Extra addons WORKDIR /opt/odoo/extra-addons @@ -7,6 +7,6 @@ RUN git clone --depth 1 -b 10.0 https://github.com/OCA/vertical-association # Own GOLEM Code WORKDIR /opt/odoo/custom-addons -RUN git clone --depth 1 -b 10.0 https://git.yaltik.net/Yaltik/yaltik_odoo_custom.git yaltik -RUN git clone --depth 1 -b stable https://git.yaltik.net/yaltik/golem.git golem +RUN git clone --depth 1 -b 10.0 https://git.yaltik.net/Yaltik/yaltik_odoo_custom.git yaltik && \ + git clone --depth 1 -b stable https://git.yaltik.net/yaltik/golem.git golem WORKDIR /opt/odoo diff --git a/odoo/golem/Dockerfile.v3.dev b/odoo/golem/Dockerfile.v3.dev index 04b8b7f..0de491f 100644 --- a/odoo/golem/Dockerfile.v3.dev +++ b/odoo/golem/Dockerfile.v3.dev @@ -1,17 +1,16 @@ FROM registry.yaltik.net/golem:yaltikstable -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # PostgreSQL CLI # Mandatory for pyhton2 # RUN pip install --user pgcli==2.2.0 --only-binary psycopg2 # COPY pgcli.sh ./ # Odoo specific -RUN pip install --user watchdog -RUN pip install --user ipython -RUN mkdir -p /opt/odoo/.ipython/profile_default -COPY ipython_config.py ./.ipython/profile_default/ -COPY shell_helpers.py ./ -COPY shell10.sh ./shell.sh -COPY i18n.sh ./ -COPY launch10.dev.sh ./launch10.sh +RUN pip install --user --no-cache-dir watchdog==0.10.7 ipython==5.10.0 && \ + mkdir -p /opt/odoo/.ipython/profile_default +COPY ipython_config.py /opt/odoo/.ipython/profile_default/ +COPY shell_helpers.py /opt/odoo/ +COPY shell10.sh /opt/odoo/shell.sh +COPY i18n.sh /opt/odoo/ +COPY launch10.dev.sh /opt/odoo/launch10.sh ENV DEV 1 diff --git a/odoo/nginx/Dockerfile b/odoo/nginx/Dockerfile index e0fffcc..1c0b15f 100644 --- a/odoo/nginx/Dockerfile +++ b/odoo/nginx/Dockerfile @@ -1,9 +1,8 @@ FROM registry.yaltik.net/nginx:yaltik -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # Default variables -ENV ODOO_SERVICE odoo -ENV ODOO_SERVER_NAMES odoo +ENV ODOO_SERVICE="odoo" ODOO_SERVER_NAMES="odoo" # Copy templates and usefull files COPY odoo.conf /etc/nginx/templates/ diff --git a/odoo/nginx/Dockerfile.dev b/odoo/nginx/Dockerfile.dev index 222d224..2c8d079 100644 --- a/odoo/nginx/Dockerfile.dev +++ b/odoo/nginx/Dockerfile.dev @@ -1,9 +1,8 @@ FROM registry.yaltik.net/nginx:yaltik -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # Default variables -ENV ODOO_SERVICE odoo -ENV ODOO_SERVER_NAMES odoo +ENV ODOO_SERVICE="odoo" ODOO_SERVER_NAMES="odoo" # Copy templates and usefull files COPY odoo.conf.dev /etc/nginx/templates/odoo.conf diff --git a/odoo/odoo/Dockerfile.10.centos7 b/odoo/odoo/Dockerfile.10.centos7 index 14d8103..f677aea 100644 --- a/odoo/odoo/Dockerfile.10.centos7 +++ b/odoo/odoo/Dockerfile.10.centos7 @@ -1,32 +1,22 @@ FROM oraclelinux:7 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " -# Odoo dependencies from OL repository -RUN yum -y groupinstall "Development Tools" -RUN yum -y install zlib-devel bzip2-devel openssl openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel gdbm-devel libpcap-devel xz-devel git mercurial libpng libjpeg libXext curl xorg-x11-font-utils fontconfig python-virtualenv libevent-devel libxml2-devel libxslt-devel openldap-devel openjpeg-devel freetype-devel libjpeg-turbo-devel libtiff-devel kernel-devel mailcap - -# EPEL for NodeJS -RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm -# Packages from EPEL -RUN yum --enablerepo=epel -y install nodejs npm python-pip -# WKHTMLTOPDF -RUN yum -y install https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox-0.12.5-1.centos7.x86_64.rpm - -# Install NPM dependencies -RUN npm install -g less@2 less-plugin-clean-css - -# PostgreSQL 9.6 -# From SCLO ? -RUN yum -y install https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm -RUN yum -y install postgresql96 libpqxx +# Odoo dependencies from OL repository and from EPEL, WKHTML +# Then PG96 and fonts +RUN yum -y groupinstall "Development Tools" && \ + yum -y install zlib-devel bzip2-devel openssl openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel gdbm-devel libpcap-devel xz-devel git mercurial libpng libjpeg libXext curl xorg-x11-font-utils fontconfig python-virtualenv libevent-devel libxml2-devel libxslt-devel openldap-devel openjpeg-devel freetype-devel libjpeg-turbo-devel libtiff-devel kernel-devel mailcap && \ + yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \ + yum --enablerepo=epel -y install nodejs npm python-pip && \ + yum -y install https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox-0.12.5-1.centos7.x86_64.rpm && \ + yum -y install https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm && \ + yum -y install postgresql96 libpqxx && \ + yum -y install liberation-fonts && \ + yum clean all -# Fonts -RUN yum -y install liberation-fonts - -# Upgrade pip -RUN pip install -U pip==20.3.4 -RUN pip install -U setuptools +# Install NPM dependencies and Python ones +RUN npm install -g less@2 less-plugin-clean-css@1.5.1 && \ + pip install --no-cache-dir -U pip==20.3.4 setuptools==44.1.1 # Create odoo user RUN useradd odoo -md /opt/odoo @@ -36,15 +26,15 @@ ENV ODOO_BRANCH 10.0 WORKDIR /opt/odoo # Default user : odoo USER odoo -RUN mkdir pipcache data backups extra-addons custom-addons -RUN git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OCB.git -RUN pip install --user -r OCB/requirements.txt +RUN mkdir pipcache data backups extra-addons custom-addons && \ + git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OCB.git && \ + pip install --user --no-cache-dir -r OCB/requirements.txt # Fix bad commit WORKDIR /opt/odoo/OCB RUN git config user.email "fabien@yaltik.com" && \ - git config user.name "Fabien BOURGEOIS" -RUN git fetch origin pull/1113/head:10.0-binary-widget-fix && \ + git config user.name "Fabien BOURGEOIS" && \ + git fetch origin pull/1113/head:10.0-binary-widget-fix && \ git cherry-pick 0eb02e12619cdd52f6a37accfb58c1b35a165fbe WORKDIR /opt/odoo diff --git a/odoo/odoo/Dockerfile.10.centos7.dev b/odoo/odoo/Dockerfile.10.centos7.dev index cc3a8d0..4f33ea0 100644 --- a/odoo/odoo/Dockerfile.10.centos7.dev +++ b/odoo/odoo/Dockerfile.10.centos7.dev @@ -1,17 +1,16 @@ FROM registry.yaltik.net/odoo:yaltik10c7 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # PostgreSQL CLI # Mandatory for pyhton2 # RUN pip install --user pgcli==2.2.0 --only-binary psycopg2 # COPY pgcli.sh ./ # Odoo specific -RUN pip install --user watchdog -RUN pip install --user ipython -RUN mkdir -p /opt/odoo/.ipython/profile_default -COPY ipython_config.py ./.ipython/profile_default/ -COPY shell_helpers.py ./ -COPY shell10.sh ./shell.sh -COPY i18n.sh ./ -COPY launch10.dev.sh ./launch10.sh +RUN pip install --user --no-cache-dir watchdog==0.10.7 ipython==5.10.0 && \ + mkdir -p /opt/odoo/.ipython/profile_default +COPY ipython_config.py /opt/odoo/.ipython/profile_default/ +COPY shell_helpers.py /opt/odoo/ +COPY shell10.sh /opt/odoo/shell.sh +COPY i18n.sh /opt/odoo/ +COPY launch10.dev.sh /opt/odoo/launch10.sh ENV DEV 1 diff --git a/odoo/odoo/Dockerfile.12 b/odoo/odoo/Dockerfile.12 index 1163197..6a2cadc 100644 --- a/odoo/odoo/Dockerfile.12 +++ b/odoo/odoo/Dockerfile.12 @@ -1,41 +1,35 @@ FROM debian:stretch -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # http://bugs.python.org/issue19846 # > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK. ENV LANG C.UTF-8 +SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Odoo dependencies from Debian APT repository -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - python3-pip python3-pyldap python3-qrcode python3-renderpm \ - python3-setuptools python3-vobject python3-watchdog python3-dev \ - build-essential git mercurial curl \ - libxml2-dev libxslt1-dev libldap2-dev libsasl2-dev libjpeg-dev libpq-dev \ - libfreetype6-dev libssl1.0-dev \ - nodejs node-less xz-utils - -# Handle Node PATH -RUN ln -s /usr/bin/nodejs /usr/bin/node - # PostgreSQL 10.x -RUN apt-get update && apt-get install -y --no-install-recommends gnupg -RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" \ - > /etc/apt/sources.list.d/postgresql.list \ - && curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ - && apt-get update \ - && apt-get install -y libpq-dev postgresql-client-10 - +# Handle Node PATH # WKHTMLTOPDF and fonts -RUN 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 -y --fix-broken install - -# Packages cleanup -RUN apt-get purge -y --auto-remove \ - && apt-get clean \ - && rm -r ./wkhtmltox* +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + python3-pip python3-pyldap python3-qrcode python3-renderpm \ + python3-setuptools python3-vobject python3-watchdog python3-dev \ + build-essential git mercurial curl \ + libxml2-dev libxslt1-dev libldap2-dev libsasl2-dev libjpeg-dev libpq-dev \ + libfreetype6-dev libssl1.0-dev \ + nodejs node-less xz-utils && \ + apt-get update && apt-get install -y --no-install-recommends gnupg && \ + echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" \ + > /etc/apt/sources.list.d/postgresql.list && \ + curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \ + apt-get update && \ + apt-get install -y libpq-dev postgresql-client-10 && \ + 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 -y --fix-broken install && \ + apt-get clean && rm -rf /var/lib/apt/lists/* && rm -r ./wkhtmltox* && \ + ln -s /usr/bin/nodejs /usr/bin/node # Create odoo user RUN useradd odoo -md /opt/odoo @@ -45,13 +39,12 @@ ENV ODOO_BRANCH 12.0 WORKDIR /opt/odoo # Default user : odoo USER odoo -RUN mkdir pipcache data backups extra-addons custom-addons -RUN git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OCB.git -# PATH update -RUN echo 'export PATH="$PATH:$HOME/.local/bin/"' >> /opt/odoo/.profile -RUN pip3 install --user -U pip -RUN .local/bin/pip3 install --user -r OCB/requirements.txt -RUN .local/bin/pip3 install --user phonenumbers +RUN mkdir pipcache data backups extra-addons custom-addons && \ + git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OCB.git && \ + echo 'export PATH="$PATH:$HOME/.local/bin/"' >> /opt/odoo/.profile && \ + pip3 install --user --no-cache-dir -U pip && \ + .local/bin/pip3 install --no-cache-dir --user -r OCB/requirements.txt && \ + .local/bin/pip3 install --no-cache-dir --user phonenumbers==8.12.44 # Launch scripts COPY ./launch12.sh ./launch.sh diff --git a/odoo/odoo/Dockerfile.12.dev b/odoo/odoo/Dockerfile.12.dev index d38a350..1747fda 100644 --- a/odoo/odoo/Dockerfile.12.dev +++ b/odoo/odoo/Dockerfile.12.dev @@ -1,12 +1,12 @@ FROM registry.yaltik.net/odoo:yaltik12 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # PostgreSQL CLI # RUN .local/bin/pip3 install --user pgcli # COPY pgcli.sh ./ # Odoo specific -RUN .local/bin/pip3 install --user watchdog -COPY shell12.sh ./shell.sh -COPY i18n.sh ./i18n.sh -COPY launch12.dev.sh ./launch.sh +RUN .local/bin/pip3 install --user --no-cache-dir watchdog==0.10.7 +COPY shell12.sh /opt/odoo/shell.sh +COPY i18n.sh /opt/odoo/i18n.sh +COPY launch12.dev.sh /opt/odoo/launch.sh ENV DEV 1 diff --git a/odoo/odoo/Dockerfile.14 b/odoo/odoo/Dockerfile.14 index 4e6eb98..1c9c1b4 100644 --- a/odoo/odoo/Dockerfile.14 +++ b/odoo/odoo/Dockerfile.14 @@ -1,5 +1,5 @@ FROM debian:buster-slim -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # Generate locale C.UTF-8 for postgres and general locale data # http://bugs.python.org/issue19846 @@ -22,41 +22,33 @@ ENV LANG C.UTF-8 # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf +# WKHTMLTOPDF +# PostgreSQL-client +# Needed to build +# NPM rtlcss +SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates curl dirmngr fonts-noto-cjk gnupg libssl-dev \ node-less npm python3-num2words python3-pdfminer python3-pip \ python3-phonenumbers python3-pyldap python3-qrcode python3-renderpm \ python3-setuptools python3-slugify python3-vobject python3-watchdog \ - python3-xlrd python3-xlwt xz-utils - -# WKHTMLTOPDF -RUN 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 - -# PostgreSQL-client -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' \ - && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ - && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && apt-get update \ - && apt-get install --no-install-recommends -y libpq-dev postgresql-client-12 - -# NPM rtlcss -RUN npm install -g rtlcss - -# Needed to build -RUN apt-get install -y --no-install-recommends build-essential git mercurial curl \ + 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.buster_amd64.deb && \ + echo 'ea8277df4297afc507c61122f3c349af142f31e5 wkhtmltox.deb' | sha1sum -c - && \ + apt-get install -y --no-install-recommends ./wkhtmltox.deb && \ + 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' && \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" && \ + gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc && \ + gpgconf --kill all \ && rm -rf "$GNUPGHOME" && \ + apt-get update && \ + apt-get install --no-install-recommends -y libpq-dev postgresql-client-12 && \ + apt-get install -y --no-install-recommends build-essential git mercurial curl \ python3-dev libxml2-dev libxslt1-dev libldap2-dev libsasl2-dev \ - libjpeg-dev libfreetype6-dev libssl-dev - -# Packages cleanup -RUN apt-get purge -y --auto-remove && apt-get clean + libjpeg-dev libfreetype6-dev libssl-dev && \ + apt-get clean && rm -rf /var/lib/apt/lists/* wkhtmltox.deb && \ + npm install -g rtlcss@2.6.2 # Create odoo user RUN useradd odoo -md /opt/odoo @@ -66,11 +58,11 @@ ENV ODOO_BRANCH 14.0 WORKDIR /opt/odoo # Default user : odoo USER odoo -RUN mkdir pipcache data backups extra-addons custom-addons -RUN git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OCB.git -RUN pip3 install --user -U pip -RUN pip3 install --user -r OCB/requirements.txt -RUN pip3 install --user phonenumbers +RUN mkdir pipcache data backups extra-addons custom-addons && \ + git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OCB.git && \ + pip3 install --no-cache-dir --user -U pip==22.0.3 && \ + pip3 install --no-cache-dir --user -r OCB/requirements.txt && \ + pip3 install --no-cache-dir --user phonenumbers==8.12.44 # Launch scripts COPY ./launch14.sh ./launch.sh diff --git a/odoo/odoo/Dockerfile.14.dev b/odoo/odoo/Dockerfile.14.dev index f92a227..a576d07 100644 --- a/odoo/odoo/Dockerfile.14.dev +++ b/odoo/odoo/Dockerfile.14.dev @@ -1,16 +1,16 @@ FROM registry.yaltik.net/odoo:yaltik14 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # PostgreSQL CLI # RUN .local/bin/pip3 install --user pgcli # COPY pgcli.sh ./ # Odoo specific -RUN pip3 install --user watchdog -RUN pip3 install --user ipython -RUN mkdir -p /opt/odoo/.ipython/profile_default -COPY ipython_config.py ./.ipython/profile_default/ -COPY shell_helpers.py ./ -COPY shell12.sh ./shell.sh -COPY i18n.sh ./i18n.sh -COPY launch12.dev.sh ./launch.sh +RUN pip3 install --no-cache-dir --user watchdog==2.1.6 ipython==7.32.0 && \ + mkdir -p /opt/odoo/.ipython/profile_default + +COPY ipython_config.py /opt/odoo/.ipython/profile_default/ +COPY shell_helpers.py /opt/odoo/ +COPY shell12.sh /opt/odoo/shell.sh +COPY i18n.sh /opt/odoo/i18n.sh +COPY launch12.dev.sh /opt/odoo/launch.sh ENV DEV 1 diff --git a/odoo/odoo/Dockerfile.15 b/odoo/odoo/Dockerfile.15 index cdad861..2033d17 100644 --- a/odoo/odoo/Dockerfile.15 +++ b/odoo/odoo/Dockerfile.15 @@ -1,48 +1,40 @@ FROM debian:bullseye-slim -MAINTAINER Odoo S.A. -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Odoo S.A. " +LABEL maintainer="Yaltik - Fabien Bourgeois " # Generate locale C.UTF-8 for postgres and general locale data # http://bugs.python.org/issue19846 # > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK. ENV LANG C.UTF-8 +SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf +# WKHTMLTOPDF +# PostgreSQL-client +# Needed to build +# NPM rtlcss RUN apt-get update && \ apt-get install -y --no-install-recommends \ ca-certificates curl dirmngr fonts-noto-cjk gnupg libssl-dev node-less npm \ python3-num2words python3-pdfminer python3-pip python3-phonenumbers python3-pyldap \ python3-qrcode python3-renderpm python3-setuptools python3-slugify python3-vobject \ - python3-watchdog python3-xlrd python3-xlwt xz-utils - -# WKHTMLTOPDF -RUN 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 -f wkhtmltox.deb - -# PostgreSQL-client -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' \ - && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ - && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && apt-get update \ - && apt-get install --no-install-recommends -y postgresql-client-14 libpq-dev -# -# NPM rtlcss -RUN npm install -g rtlcss - -# Needed to build -RUN apt-get install -y --no-install-recommends build-essential git mercurial curl \ - python3-dev libxml2-dev libxslt1-dev libldap2-dev libsasl2-dev \ - libjpeg-dev libfreetype6-dev libssl-dev - -# Packages cleanup -RUN apt-get purge -y --auto-remove && apt-get clean + python3-watchdog 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.buster_amd64.deb && \ + echo 'ea8277df4297afc507c61122f3c349af142f31e5 wkhtmltox.deb' | sha1sum -c - && \ + apt-get install -y --no-install-recommends ./wkhtmltox.deb && \ + 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' && \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" && \ + gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc && \ + gpgconf --kill all && rm -rf "$GNUPGHOME" && \ + apt-get update && \ + apt-get install --no-install-recommends -y postgresql-client-14 libpq-dev && \ + apt-get install -y --no-install-recommends build-essential git mercurial curl \ + python3-dev libxml2-dev libxslt1-dev libldap2-dev libsasl2-dev \ + libjpeg-dev libfreetype6-dev libssl-dev && \ + apt-get clean && rm -rf /var/lib/apt/lists/* wkhtmltox.deb && \ + npm install -g rtlcss@2.6.2 # Create odoo user RUN useradd odoo -md /opt/odoo @@ -52,11 +44,11 @@ ENV ODOO_BRANCH 15.0 WORKDIR /opt/odoo # Default user : odoo USER odoo -RUN mkdir pipcache data backups extra-addons custom-addons -RUN git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OCB.git -RUN pip3 install --user -U pip -RUN pip3 install --user -r OCB/requirements.txt -RUN pip3 install --user phonenumbers +RUN mkdir pipcache data backups extra-addons custom-addons && \ + git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OCB.git && \ + pip3 install --no-cache-dir --user -U pip==22.0.3 && \ + pip3 install --no-cache-dir --user -r OCB/requirements.txt && \ + pip3 install --no-cache-dir --user phonenumbers==8.12.44 # Launch scripts COPY ./launch14.sh ./launch.sh diff --git a/odoo/odoo/Dockerfile.15.dev b/odoo/odoo/Dockerfile.15.dev index f3ff3d2..ee9dacb 100644 --- a/odoo/odoo/Dockerfile.15.dev +++ b/odoo/odoo/Dockerfile.15.dev @@ -5,8 +5,12 @@ MAINTAINER Yaltik - Fabien Bourgeois # RUN .local/bin/pip3 install --user pgcli # COPY pgcli.sh ./ # Odoo specific -RUN .local/bin/pip3 install --user watchdog -COPY shell12.sh ./shell.sh -COPY i18n.sh ./i18n.sh -COPY launch12.dev.sh ./launch.sh +RUN pip3 install --no-cache-dir --user watchdog==2.1.6 ipython==7.32.0 && \ + mkdir -p /opt/odoo/.ipython/profile_default + +COPY ipython_config.py /opt/odoo/.ipython/profile_default/ +COPY shell_helpers.py /opt/odoo/ +COPY shell12.sh /opt/odoo/shell.sh +COPY i18n.sh /opt/odoo/i18n.sh +COPY launch12.dev.sh /opt/odoo/launch.sh ENV DEV 1 diff --git a/odoo/odoo/Dockerfile.60 b/odoo/odoo/Dockerfile.60 index 7ca1cd8..49997de 100644 --- a/odoo/odoo/Dockerfile.60 +++ b/odoo/odoo/Dockerfile.60 @@ -1,17 +1,16 @@ FROM oraclelinux:6 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # OpenERP dependencies from CentOS -RUN yum update -y -RUN yum install -y python-devel pychart python-dateutil python-reportlab \ -python-lxml python-psycopg2 python-mako python-setuptools pytz PyYAML graphviz \ -python-imaging wget git unzip gcc -# RUN yum groupinstall -y "Development Tools" +RUN yum update -y && \ + yum install -y python-devel pychart python-dateutil python-reportlab \ + python-lxml python-psycopg2 python-mako python-setuptools pytz PyYAML graphviz \ + python-imaging wget git unzip gcc && yum clean all # Install OpenERP dependencies not available from CentOS6 repo -RUN easy_install pydot==1.0.29 -RUN easy_install vobject==0.8.2 -RUN easy_install PyWebDAV==0.9.4.1 +RUN easy_install pydot==1.0.29 && \ + easy_install vobject==0.8.2 && \ + easy_install PyWebDAV==0.9.4.1 # Alternative : home install PyWebDAV, not useless finally # RUN wget https://files.pythonhosted.org/packages/e9/14/5f2a654233e533797f32dd670dab8dd61ac974d5105950481e872bddb898/PyWebDAV-0.9.8.tar.gz # RUN tar xzf PyWebDAV-0.9.8.tar.gz @@ -27,10 +26,10 @@ WORKDIR /opt/odoo USER odoo # Install Odoo v6.0 -RUN mkdir -p pipcache data backups extra-addons custom-addons www/html/ -RUN wget https://github.com/odoo/odoo/archive/${ODOO_BRANCH}.zip -RUN unzip ${ODOO_BRANCH}.zip && rm ${ODOO_BRANCH}.zip -RUN mv odoo-${ODOO_BRANCH} odoo +RUN mkdir -p pipcache data backups extra-addons custom-addons www/html/ && \ + wget -q https://github.com/odoo/odoo/archive/${ODOO_BRANCH}.zip && \ + unzip ${ODOO_BRANCH}.zip && rm ${ODOO_BRANCH}.zip && \ + mv odoo-${ODOO_BRANCH} odoo # RUN git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/odoo/odoo.git USER root WORKDIR /opt/odoo/odoo/ @@ -38,9 +37,9 @@ RUN python setup.py install # OpenERP 6 extra addons was used, so install it... and its dependencies WORKDIR /opt/odoo/ -RUN easy_install bzr -RUN bzr init-repo extra-addons -RUN bzr branch lp:openobject-addons/extra-6.0 extra-addons/openerp-extra-6.0 +RUN easy_install bzr && \ + bzr init-repo extra-addons && \ + bzr branch lp:openobject-addons/extra-6.0 extra-addons/openerp-extra-6.0 # COPY openerp-extra-60.zip ./ # RUN unzip openerp-extra-60.zip && rm openerp-extra-60.zip RUN easy_install egenix-mx-base @@ -52,4 +51,4 @@ COPY launch60.sh launch.sh EXPOSE 8069 8070 8071 -CMD bash launch.sh +CMD ["bash", "launch.sh"] diff --git a/odoo/odoo/Dockerfile.8.centos7 b/odoo/odoo/Dockerfile.8.centos7 index 63b303d..81bdd7d 100644 --- a/odoo/odoo/Dockerfile.8.centos7 +++ b/odoo/odoo/Dockerfile.8.centos7 @@ -1,25 +1,22 @@ FROM oraclelinux:7 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # Odoo dependencies from Debian APT repository -RUN yum -y groupinstall "Development Tools" && yum -y install zlib-devel bzip2-devel openssl openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel gdbm-devel libpcap-devel xz-devel git mercurial libpng libjpeg libXext curl xorg-x11-font-utils fontconfig python-virtualenv libevent-devel libxml2-devel libxslt-devel openldap-devel openjpeg-devel freetype-devel libjpeg-turbo-devel libtiff-devel kernel-devel - # EPEL for NodeJS -RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm -# Packages from EPEL -RUN yum --enablerepo=epel -y install nodejs npm python-pip # WKHTMLTOPDF -RUN yum -y install https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox-0.12.5-1.centos7.x86_64.rpm - # Install NPM dependencies -RUN npm install -g less@2 less-plugin-clean-css - # PostgreSQL 9.5 -RUN curl -LO https://download.postgresql.org/pub/repos/yum/9.5/redhat/rhel-7-x86_64/libpqxx-5.0.1-2.rhel7.x86_64.rpm && curl -LO https://download.postgresql.org/pub/repos/yum/9.5/redhat/rhel-7-x86_64/postgresql95-9.5.25-1PGDG.rhel7.x86_64.rpm && curl -LO https://download.postgresql.org/pub/repos/yum/9.5/redhat/rhel-7-x86_64/postgresql95-libs-9.5.25-1PGDG.rhel7.x86_64.rpm -RUN yum install -y ./*.rpm - # Fonts -RUN yum -y install liberation-fonts +RUN yum -y groupinstall "Development Tools" && yum -y install zlib-devel bzip2-devel openssl openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel gdbm-devel libpcap-devel xz-devel git mercurial libpng libjpeg libXext curl xorg-x11-font-utils fontconfig python-virtualenv libevent-devel libxml2-devel libxslt-devel openldap-devel openjpeg-devel freetype-devel libjpeg-turbo-devel libtiff-devel kernel-devel && \ + yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \ + yum --enablerepo=epel -y install nodejs npm python-pip && \ + yum -y install https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox-0.12.5-1.centos7.x86_64.rpm && \ + npm install -g less@2 less-plugin-clean-css@1.5.1 && \ + curl -LO https://download.postgresql.org/pub/repos/yum/9.5/redhat/rhel-7-x86_64/libpqxx-5.0.1-2.rhel7.x86_64.rpm && \ + curl -LO https://download.postgresql.org/pub/repos/yum/9.5/redhat/rhel-7-x86_64/postgresql95-9.5.25-1PGDG.rhel7.x86_64.rpm && \ + curl -LO https://download.postgresql.org/pub/repos/yum/9.5/redhat/rhel-7-x86_64/postgresql95-libs-9.5.25-1PGDG.rhel7.x86_64.rpm && \ + yum install -y ./*.rpm && \ + yum -y install liberation-fonts && yum clean all # Create odoo user RUN useradd odoo -md /opt/odoo @@ -29,9 +26,9 @@ ENV ODOO_BRANCH 8.0 WORKDIR /opt/odoo # Default user : odoo USER odoo -RUN mkdir pipcache data backups extra-addons custom-addons -RUN git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OCB.git -RUN pip install --user -r OCB/requirements.txt +RUN mkdir pipcache data backups extra-addons custom-addons && \ + git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OCB.git && \ + pip install --user --no-cache-dir -r OCB/requirements.txt # Launch scripts COPY ./launch.sh ./launch.sh diff --git a/odoo/odoo/Dockerfile.8.centos7.dev b/odoo/odoo/Dockerfile.8.centos7.dev index b1e6614..7c247cf 100644 --- a/odoo/odoo/Dockerfile.8.centos7.dev +++ b/odoo/odoo/Dockerfile.8.centos7.dev @@ -1,5 +1,5 @@ FROM registry.yaltik.net/odoo:yaltik8c7 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " WORKDIR /opt/odoo/extra-addons RUN git clone --depth 1 -b 8.0 https://github.com/OCA/server-tools diff --git a/odoo/odoo/Dockerfile.dev b/odoo/odoo/Dockerfile.dev index 26a1952..5a6b510 100644 --- a/odoo/odoo/Dockerfile.dev +++ b/odoo/odoo/Dockerfile.dev @@ -1,5 +1,5 @@ FROM registry.yaltik.net/odoo:yaltik8 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " WORKDIR /opt/odoo/extra-addons RUN git clone --depth 1 -b 8.0 https://github.com/OCA/server-tools diff --git a/odoo/odoo/Dockerfile.ext.10 b/odoo/odoo/Dockerfile.ext.10 index 946aaee..23602d0 100644 --- a/odoo/odoo/Dockerfile.ext.10 +++ b/odoo/odoo/Dockerfile.ext.10 @@ -1,22 +1,20 @@ FROM registry.yaltik.net/odoo:yaltikbase10 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " -# Extra dependency -RUN pip install --user unidecode==1.2.0 +# Extra dependencies +RUN pip install --user --no-cache-dir unidecode==1.2.0 && \ + pip install --user --no-cache-dir git+https://github.com/OCA/openupgradelib.git@v3.3.2 # External code WORKDIR /opt/odoo/extra-addons -RUN git clone --depth 1 -b 10.0 https://github.com/OCA/community-data-files -RUN git clone --depth 1 -b 10.0 https://github.com/OCA/reporting-engine -RUN git clone --depth 1 -b 10.0 https://github.com/OCA/l10n-france -RUN git clone --depth 1 -b 10.0 https://github.com/OCA/partner-contact -RUN git clone --depth 1 -b 10.0 https://github.com/OCA/crm -RUN git clone --depth 1 -b 10.0 https://github.com/OCA/queue -RUN git clone --depth 1 -b 10.0 https://github.com/OCA/server-tools -RUN git clone --depth 1 -b 10.0 https://github.com/OCA/web -RUN git clone --depth 1 -b 10.0 https://github.com/Openworx/backend_theme +RUN git clone --depth 1 -b 10.0 https://github.com/OCA/community-data-files && \ + git clone --depth 1 -b 10.0 https://github.com/OCA/reporting-engine && \ + git clone --depth 1 -b 10.0 https://github.com/OCA/l10n-france && \ + git clone --depth 1 -b 10.0 https://github.com/OCA/partner-contact && \ + git clone --depth 1 -b 10.0 https://github.com/OCA/crm && \ + git clone --depth 1 -b 10.0 https://github.com/OCA/queue && \ + git clone --depth 1 -b 10.0 https://github.com/OCA/server-tools && \ + git clone --depth 1 -b 10.0 https://github.com/OCA/web && \ + git clone --depth 1 -b 10.0 https://github.com/Openworx/backend_theme WORKDIR /opt/odoo - -# Addons dependencies -RUN pip install --user git+https://github.com/OCA/openupgradelib.git diff --git a/odoo/odoo/Dockerfile.ext.10.centos7 b/odoo/odoo/Dockerfile.ext.10.centos7 index d3d1ec9..219caa4 100644 --- a/odoo/odoo/Dockerfile.ext.10.centos7 +++ b/odoo/odoo/Dockerfile.ext.10.centos7 @@ -1,22 +1,20 @@ FROM registry.yaltik.net/odoo:yaltikbase10c7 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " -# Extra dependency -RUN pip install --user unidecode==1.2.0 requests-oauthlib +# Extra dependencies +RUN pip install --user --no-cache-dir unidecode==1.2.0 requests-oauthlib==1.3.1 && \ + pip install --user git+https://github.com/OCA/openupgradelib.git@v3.3.2 # External code WORKDIR /opt/odoo/extra-addons -RUN git clone --depth 1 -b 10.0 https://github.com/OCA/community-data-files -RUN git clone --depth 1 -b 10.0 https://github.com/OCA/reporting-engine -RUN git clone --depth 1 -b 10.0 https://github.com/OCA/l10n-france -RUN git clone --depth 1 -b 10.0 https://github.com/OCA/partner-contact -RUN git clone --depth 1 -b 10.0 https://github.com/OCA/crm -RUN git clone --depth 1 -b 10.0 https://github.com/OCA/queue -RUN git clone --depth 1 -b 10.0 https://github.com/OCA/server-tools -RUN git clone --depth 1 -b 10.0 https://github.com/OCA/web -RUN git clone --depth 1 -b 10.0 https://github.com/Openworx/backend_theme +RUN git clone --depth 1 -b 10.0 https://github.com/OCA/community-data-files && \ + git clone --depth 1 -b 10.0 https://github.com/OCA/reporting-engine && \ + git clone --depth 1 -b 10.0 https://github.com/OCA/l10n-france && \ + git clone --depth 1 -b 10.0 https://github.com/OCA/partner-contact && \ + git clone --depth 1 -b 10.0 https://github.com/OCA/crm && \ + git clone --depth 1 -b 10.0 https://github.com/OCA/queue && \ + git clone --depth 1 -b 10.0 https://github.com/OCA/server-tools && \ + git clone --depth 1 -b 10.0 https://github.com/OCA/web && \ + git clone --depth 1 -b 10.0 https://github.com/Openworx/backend_theme WORKDIR /opt/odoo - -# Addons dependencies -RUN pip install --user git+https://github.com/OCA/openupgradelib.git diff --git a/odoo/odoo/Dockerfile.ext.12 b/odoo/odoo/Dockerfile.ext.12 index 7bd10c0..9ba25c6 100644 --- a/odoo/odoo/Dockerfile.ext.12 +++ b/odoo/odoo/Dockerfile.ext.12 @@ -1,20 +1,20 @@ FROM registry.yaltik.net/odoo:yaltikbase12 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # External code WORKDIR /opt/odoo/extra-addons -RUN git clone --depth 1 -b 12.0 https://github.com/OCA/community-data-files -RUN git clone --depth 1 -b 12.0 https://github.com/OCA/l10n-france -RUN git clone --depth 1 -b 12.0 https://github.com/OCA/queue -RUN git clone --depth 1 -b 12.0 https://github.com/OCA/partner-contact -RUN git clone --depth 1 -b 12.0 https://github.com/OCA/social -RUN git clone --depth 1 -b 12.0 https://github.com/OCA/server-brand -RUN git clone --depth 1 -b 12.0 https://github.com/OCA/web -RUN git clone --depth 1 -b 12.0 https://github.com/OCA/website -RUN git clone --depth 1 -b 12.0 https://github.com/muk-it/muk_base -RUN git clone --depth 1 -b 12.0 https://github.com/muk-it/muk_misc -RUN git clone --depth 1 -b 12.0 https://github.com/muk-it/muk_web -RUN git clone --depth 1 -b 12.0 https://github.com/muk-it/muk_website +RUN git clone --depth 1 -b 12.0 https://github.com/OCA/community-data-files && \ + git clone --depth 1 -b 12.0 https://github.com/OCA/l10n-france && \ + git clone --depth 1 -b 12.0 https://github.com/OCA/queue && \ + git clone --depth 1 -b 12.0 https://github.com/OCA/partner-contact && \ + git clone --depth 1 -b 12.0 https://github.com/OCA/social && \ + git clone --depth 1 -b 12.0 https://github.com/OCA/server-brand && \ + git clone --depth 1 -b 12.0 https://github.com/OCA/web && \ + git clone --depth 1 -b 12.0 https://github.com/OCA/website && \ + git clone --depth 1 -b 12.0 https://github.com/muk-it/muk_base && \ + git clone --depth 1 -b 12.0 https://github.com/muk-it/muk_misc && \ + git clone --depth 1 -b 12.0 https://github.com/muk-it/muk_web && \ + git clone --depth 1 -b 12.0 https://github.com/muk-it/muk_website # Custom code WORKDIR /opt/odoo/custom-addons @@ -23,5 +23,5 @@ RUN git clone --depth 1 -b 12.0 https://git.yaltik.net/Yaltik/yaltik_odoo_custom WORKDIR /opt/odoo # Addons dependencies -RUN .local/bin/pip3 install --user setuptools-scm -RUN .local/bin/pip3 install --user git+https://github.com/OCA/openupgradelib.git +RUN .local/bin/pip3 install --user --no-cache-dir setuptools-scm==5.0.2 && \ + .local/bin/pip3 install --user --no-cache-dir git+https://github.com/OCA/openupgradelib.git@v3.3.2 diff --git a/odoo/odoo/Dockerfile.ext.14 b/odoo/odoo/Dockerfile.ext.14 index fa03b99..b96f53a 100644 --- a/odoo/odoo/Dockerfile.ext.14 +++ b/odoo/odoo/Dockerfile.ext.14 @@ -1,17 +1,17 @@ FROM registry.yaltik.net/odoo:yaltikbase14 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # External code WORKDIR /opt/odoo/extra-addons -RUN git clone --depth 1 -b 14.0 https://github.com/OCA/community-data-files -RUN git clone --depth 1 -b 14.0 https://github.com/OCA/l10n-france -RUN git clone --depth 1 -b 14.0 https://github.com/OCA/queue -RUN git clone --depth 1 -b 14.0 https://github.com/OCA/partner-contact -RUN git clone --depth 1 -b 14.0 https://github.com/OCA/social -RUN git clone --depth 1 -b 14.0 https://github.com/OCA/server-brand -RUN git clone --depth 1 -b 14.0 https://github.com/OCA/web -RUN git clone --depth 1 -b 14.0 https://github.com/OCA/website -RUN git clone --depth 1 -b 14.0 https://github.com/Openworx/backend_theme +RUN git clone --depth 1 -b 14.0 https://github.com/OCA/community-data-files && \ + git clone --depth 1 -b 14.0 https://github.com/OCA/l10n-france && \ + git clone --depth 1 -b 14.0 https://github.com/OCA/queue && \ + git clone --depth 1 -b 14.0 https://github.com/OCA/partner-contact && \ + git clone --depth 1 -b 14.0 https://github.com/OCA/social && \ + git clone --depth 1 -b 14.0 https://github.com/OCA/server-brand && \ + git clone --depth 1 -b 14.0 https://github.com/OCA/web && \ + git clone --depth 1 -b 14.0 https://github.com/OCA/website && \ + git clone --depth 1 -b 14.0 https://github.com/Openworx/backend_theme # Custom code WORKDIR /opt/odoo/custom-addons @@ -20,4 +20,4 @@ RUN git clone --depth 1 -b 14.0 https://git.yaltik.net/Yaltik/yaltik_odoo_custom WORKDIR /opt/odoo # Addons dependencies -RUN .local/bin/pip3 install --user git+https://github.com/OCA/openupgradelib.git +RUN .local/bin/pip3 install --no-cache-dir --user git+https://github.com/OCA/openupgradelib.git@v3.3.2 diff --git a/odoo/odoo/Dockerfile.ext.15 b/odoo/odoo/Dockerfile.ext.15 index ba7a7b4..c104b8a 100644 --- a/odoo/odoo/Dockerfile.ext.15 +++ b/odoo/odoo/Dockerfile.ext.15 @@ -1,17 +1,17 @@ FROM registry.yaltik.net/odoo:yaltikbase15 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # External code WORKDIR /opt/odoo/extra-addons -RUN git clone --depth 1 -b 15.0 https://github.com/OCA/community-data-files -RUN git clone --depth 1 -b 15.0 https://github.com/OCA/l10n-france -RUN git clone --depth 1 -b 15.0 https://github.com/OCA/queue -RUN git clone --depth 1 -b 15.0 https://github.com/OCA/partner-contact -RUN git clone --depth 1 -b 15.0 https://github.com/OCA/social -RUN git clone --depth 1 -b 15.0 https://github.com/OCA/server-brand -RUN git clone --depth 1 -b 15.0 https://github.com/OCA/web -RUN git clone --depth 1 -b 15.0 https://github.com/OCA/website -RUN git clone --depth 1 -b 15.0 https://github.com/muk-it/muk_web +RUN git clone --depth 1 -b 15.0 https://github.com/OCA/community-data-files && \ + git clone --depth 1 -b 15.0 https://github.com/OCA/l10n-france && \ + git clone --depth 1 -b 15.0 https://github.com/OCA/queue && \ + git clone --depth 1 -b 15.0 https://github.com/OCA/partner-contact && \ + git clone --depth 1 -b 15.0 https://github.com/OCA/social && \ + git clone --depth 1 -b 15.0 https://github.com/OCA/server-brand && \ + git clone --depth 1 -b 15.0 https://github.com/OCA/web && \ + git clone --depth 1 -b 15.0 https://github.com/OCA/website && \ + git clone --depth 1 -b 15.0 https://github.com/muk-it/muk_web # Custom code WORKDIR /opt/odoo/custom-addons @@ -20,4 +20,4 @@ RUN git clone --depth 1 -b 15.0 https://git.yaltik.net/Yaltik/yaltik_odoo_custom WORKDIR /opt/odoo # Addons dependencies -RUN .local/bin/pip3 install --user git+https://github.com/OCA/openupgradelib.git +RUN .local/bin/pip3 install --user git+https://github.com/OCA/openupgradelib.git@v3.3.2 diff --git a/odoo/odoo/Dockerfile.openupgrade.10 b/odoo/odoo/Dockerfile.openupgrade.10 index b67127d..d8c7819 100644 --- a/odoo/odoo/Dockerfile.openupgrade.10 +++ b/odoo/odoo/Dockerfile.openupgrade.10 @@ -1,8 +1,7 @@ FROM registry.yaltik.net/odoo:yaltik10 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " WORKDIR /opt/odoo -RUN rm -rf OCB/ -RUN git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OpenUpgrade.git OCB -# TMP : use last master with last fixes -RUN pip install --user git+https://github.com/OCA/openupgradelib.git +RUN rm -rf OCB/ && \ + RUN git clone -b "${ODOO_BRANCH}" --depth 1 https://github.com/OCA/OpenUpgrade.git OCB && \ + pip install --user --no-cache-dir git+https://github.com/OCA/openupgradelib.git@v3.3.2 diff --git a/odoo/odoo/Dockerfile.openupgrade.11 b/odoo/odoo/Dockerfile.openupgrade.11 index d959ca9..df27367 100644 --- a/odoo/odoo/Dockerfile.openupgrade.11 +++ b/odoo/odoo/Dockerfile.openupgrade.11 @@ -1,8 +1,7 @@ FROM registry.yaltik.net/odoo:yaltik11 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " WORKDIR /opt/odoo -RUN rm -rf OCB/ -RUN git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OpenUpgrade.git OCB -# TMP : use last master with last fixes -RUN pip install --user git+https://github.com/OCA/openupgradelib.git +RUN rm -rf OCB/ && \ + RUN git clone -b "${ODOO_BRANCH}" --depth 1 https://github.com/OCA/OpenUpgrade.git OCB && \ + pip install --user --no-cache-dir git+https://github.com/OCA/openupgradelib.git@v3.3.2 diff --git a/odoo/odoo/Dockerfile.openupgrade.12 b/odoo/odoo/Dockerfile.openupgrade.12 index 0f5759e..0f62917 100644 --- a/odoo/odoo/Dockerfile.openupgrade.12 +++ b/odoo/odoo/Dockerfile.openupgrade.12 @@ -1,8 +1,7 @@ FROM registry.yaltik.net/odoo:yaltik12 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " WORKDIR /opt/odoo -RUN rm -rf OCB/ -RUN git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OpenUpgrade.git OCB -# TMP : use last master with last fixes -RUN .local/bin/pip install --user git+https://github.com/OCA/openupgradelib.git +RUN rm -rf OCB/ && \ + RUN git clone -b "${ODOO_BRANCH}" --depth 1 https://github.com/OCA/OpenUpgrade.git OCB && \ + pip install --user --no-cache-dir git+https://github.com/OCA/openupgradelib.git@v3.3.2 diff --git a/odoo/odoo/Dockerfile.openupgrade.9 b/odoo/odoo/Dockerfile.openupgrade.9 index 7611509..63efb65 100644 --- a/odoo/odoo/Dockerfile.openupgrade.9 +++ b/odoo/odoo/Dockerfile.openupgrade.9 @@ -1,7 +1,7 @@ FROM registry.yaltik.net/odoo:yaltik9 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " WORKDIR /opt/odoo -RUN rm -rf OCB/ -RUN git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OpenUpgrade.git OCB -RUN pip install --user git+https://github.com/OCA/openupgradelib.git +RUN rm -rf OCB/ && \ + RUN git clone -b "${ODOO_BRANCH}" --depth 1 https://github.com/OCA/OpenUpgrade.git OCB && \ + pip install --user --no-cache-dir git+https://github.com/OCA/openupgradelib.git@v3.3.2 diff --git a/odoo/odoo/Dockerfile.py3o.10 b/odoo/odoo/Dockerfile.py3o.10 index d574b08..9012295 100644 --- a/odoo/odoo/Dockerfile.py3o.10 +++ b/odoo/odoo/Dockerfile.py3o.10 @@ -1,16 +1,17 @@ FROM registry.yaltik.net/odoo:yaltik10 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # Install local LibreOffice for better conversion and supported types (bpo version) USER root # Remove inexisting source -RUN sed -i -- 's/deb http:\/\/deb.debian.org\/debian jessie-updates main/# deb http:\/\/deb.debian.org\/debian jessie-updates main/g' /etc/apt/sources.list -RUN apt-get update -RUN apt-get install -y fonts-liberation -RUN apt-get install --no-install-recommends -y libreoffice libreoffice-calc libreoffice-writer +RUN sed -i -- 's/deb http:\/\/deb.debian.org\/debian jessie-updates main/# deb http:\/\/deb.debian.org\/debian jessie-updates main/g' /etc/apt/sources.list && \ + apt-get update && \ + apt-get install -y fonts-liberation && \ + apt-get install --no-install-recommends -y libreoffice libreoffice-calc libreoffice-writer && \ + apt-get clean && rm -rf /var/lib/apt/lists/* # Addons dependencies USER odoo -RUN pip install --user py3o.template && pip install --user py3o.formats +RUN pip install --no-cache-dir --user py3o.template==0.10.0 py3o.formats==0.3 WORKDIR /opt/odoo diff --git a/odoo/odoo/Dockerfile.py3o.10.centos7 b/odoo/odoo/Dockerfile.py3o.10.centos7 index 085d969..6613f1d 100644 --- a/odoo/odoo/Dockerfile.py3o.10.centos7 +++ b/odoo/odoo/Dockerfile.py3o.10.centos7 @@ -1,19 +1,20 @@ FROM registry.yaltik.net/odoo:yaltik10c7 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # Install local LibreOffice for better conversion and supported types +# And for conversions USER root ENV LO_VERSION 5.3.7.2 -RUN curl -LO "https://downloadarchive.documentfoundation.org/libreoffice/old/"$LO_VERSION"/rpm/x86_64/LibreOffice_"$LO_VERSION"_Linux_x86-64_rpm.tar.gz" && tar zxf "LibreOffice_"$LO_VERSION"_Linux_x86-64_rpm.tar.gz" -RUN yum -y install "./LibreOffice_"$LO_VERSION"_Linux_x86-64_rpm/RPMS/"* -RUN rm -rf "./LibreOffice_"$LO_VERSION"_Linux_x86-64_rpm"* - -# For conversions -RUN yum install -y cairo cups-libs libSM -RUN ln -s /usr/bin/libreoffice5.3 /usr/local/bin/libreoffice +RUN curl -LO "https://downloadarchive.documentfoundation.org/libreoffice/old/${LO_VERSION}/rpm/x86_64/LibreOffice_${LO_VERSION}_Linux_x86-64_rpm.tar.gz" && \ + tar zxf "LibreOffice_${LO_VERSION}_Linux_x86-64_rpm.tar.gz" && \ + yum -y install "./LibreOffice_${LO_VERSION}_Linux_x86-64_rpm/RPMS/"* && \ + rm -rf "./LibreOffice_${LO_VERSION}_Linux_x86-64_rpm"* && \ + yum install -y cairo cups-libs libSM && \ + yum clean all && \ + ln -s /usr/bin/libreoffice5.3 /usr/local/bin/libreoffice # Addons dependencies USER odoo -RUN pip install --user py3o.template && pip install --user py3o.formats +RUN pip install --no-cache-dir --user py3o.template==0.10.0 py3o.formats==0.3 WORKDIR /opt/odoo diff --git a/odoo/odoo/Dockerfile.py3o.10.centos7.dev b/odoo/odoo/Dockerfile.py3o.10.centos7.dev index 188642b..cb869fb 100644 --- a/odoo/odoo/Dockerfile.py3o.10.centos7.dev +++ b/odoo/odoo/Dockerfile.py3o.10.centos7.dev @@ -1,17 +1,16 @@ FROM registry.yaltik.net/odoo:yaltikpy3o10c7 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # PostgreSQL CLI # Mandatory for pyhton2 # RUN pip install --user pgcli==2.2.0 --only-binary psycopg2 # COPY pgcli.sh ./ # Odoo specific -RUN pip install --user watchdog -RUN pip install --user ipython -RUN mkdir -p /opt/odoo/.ipython/profile_default -COPY ipython_config.py ./.ipython/profile_default/ -COPY shell_helpers.py ./ -COPY shell10.sh ./shell.sh -COPY i18n.sh ./ -COPY launch10.dev.sh ./launch10.sh +RUN pip install --user --no-cache-dir watchdog==0.10.7 ipython==5.10.0 && \ + mkdir -p /opt/odoo/.ipython/profile_default +COPY ipython_config.py /opt/odoo/.ipython/profile_default/ +COPY shell_helpers.py /opt/odoo/ +COPY shell10.sh /opt/odoo/shell.sh +COPY i18n.sh /opt/odoo/ +COPY launch10.dev.sh /opt/odoo/launch10.sh ENV DEV 1 diff --git a/odoo/odoo/Dockerfile.py3o.10.dev b/odoo/odoo/Dockerfile.py3o.10.dev index a7f7a94..19e5268 100644 --- a/odoo/odoo/Dockerfile.py3o.10.dev +++ b/odoo/odoo/Dockerfile.py3o.10.dev @@ -1,12 +1,12 @@ FROM registry.yaltik.net/odoo:yaltikpy3o10 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # PostgreSQL CLI # Mandatory for pyhton2 # RUN pip install --user pgcli==2.2.0 --only-binary psycopg2 # COPY pgcli.sh ./ # Odoo specific -RUN pip install --user watchdog +RUN pip install --user --no-cache-dir watchdog==0.10.7 COPY shell10.sh ./ COPY i18n.sh ./ COPY launch10.dev.sh ./launch10.sh diff --git a/odoo/odoo/Dockerfile.web.60 b/odoo/odoo/Dockerfile.web.60 index 8037998..ff4fbd4 100644 --- a/odoo/odoo/Dockerfile.web.60 +++ b/odoo/odoo/Dockerfile.web.60 @@ -1,10 +1,11 @@ FROM oraclelinux:6 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # OpenERP dependencies from CentOS # RUN yum update -y RUN yum install -y python-devel python-lxml python-psycopg2 python-mako \ -python-setuptools wget git gcc tar +python-setuptools wget git gcc tar && \ + yum clean all # RUN yum groupinstall -y "Development Tools" # PIP @@ -20,19 +21,19 @@ USER odoo RUN mkdir -p /opt/odoo/log/openerp-web # Web Client -RUN wget https://launchpad.net/openobject-client-web/6.0/6.0.4/+download/openerp-web-6.0.4.tar.gz -RUN tar xzf openerp-web-6.0.4.tar.gz && rm openerp-web-6.0.4.tar.gz -RUN mv openerp-web-6.0.4 openerp-web +RUN wget -q https://launchpad.net/openobject-client-web/6.0/6.0.4/+download/openerp-web-6.0.4.tar.gz && \ + tar xzf openerp-web-6.0.4.tar.gz && rm openerp-web-6.0.4.tar.gz && \ + mv openerp-web-6.0.4 openerp-web # COPY requirementsweb60.txt requirements.txt # Replace >= to exact versions on scripts -RUN sed -i -- 's/>=/==/g' openerp-web/setup.py -RUN sed -i -- 's/>=/==/g' openerp-web/lib/populate.sh # Babel specific : no version available prior to 0.9.6 -RUN sed -i -- 's/0.9.4/0.9.6/g' openerp-web/setup.py -RUN sed -i -- 's/0.9.4/0.9.6/g' openerp-web/lib/populate.sh -USER root +RUN sed -i -- 's/>=/==/g' openerp-web/setup.py && \ + sed -i -- 's/>=/==/g' openerp-web/lib/populate.sh && \ + sed -i -- 's/0.9.4/0.9.6/g' openerp-web/setup.py && \ + sed -i -- 's/0.9.4/0.9.6/g' openerp-web/lib/populate.sh +USER root # RUN pip install -r requirements.txt WORKDIR /opt/odoo/openerp-web/lib @@ -40,9 +41,10 @@ RUN bash populate.sh WORKDIR /opt/odoo/openerp-web RUN python setup.py install + USER odoo WORKDIR /opt/odoo COPY genconfweb60.sh genconf.sh COPY launchweb60.sh launch.sh -CMD bash launch.sh +CMD ["bash", "launch.sh"] diff --git a/odoo/scripts/Dockerfile b/odoo/scripts/Dockerfile index 822c33c..13cad25 100644 --- a/odoo/scripts/Dockerfile +++ b/odoo/scripts/Dockerfile @@ -1,12 +1,15 @@ FROM debian:stretch -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " -RUN apt-get update && apt-get install -y --no-install-recommends python2.7-minimal python-pip -RUN pip2 install odoorpc -# Packages cleanup -RUN apt-get purge -y --auto-remove && apt-get clean +RUN apt-get update && \ + apt-get install -y --no-install-recommends python2.7-minimal python-pip && \ + apt-get clean rm -rf /var/lib/apt/lists/* && \ + pip2 install --no-cache-dir odoorpc==0.8.0 + +# Useradd RUN useradd odoo -m -s /bin/bash USER odoo COPY *.py /home/odoo/ WORKDIR /home/odoo -CMD /bin/true + +CMD ["/bin/true"] diff --git a/odoo/scripts/Dockerfile.c7 b/odoo/scripts/Dockerfile.c7 index dd04618..bfaa6fa 100644 --- a/odoo/scripts/Dockerfile.c7 +++ b/odoo/scripts/Dockerfile.c7 @@ -1,14 +1,16 @@ FROM centos:7 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # EPEL for PIP -RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm -RUN yum --enablerepo=epel -y install python-pip +RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \ + yum --enablerepo=epel -y install python-pip && \ + yum clean all && \ + pip install --no-cache-dir odoorpc==0.8.0 -RUN pip install odoorpc -# Packages cleanup +# Useradd RUN useradd odoo -m -s /bin/bash USER odoo COPY *.py /home/odoo/ WORKDIR /home/odoo -CMD /bin/true + +CMD ["/bin/true"] diff --git a/postgres/Dockerfile.10 b/postgres/Dockerfile.10 index d0a29bf..7fdaa3b 100644 --- a/postgres/Dockerfile.10 +++ b/postgres/Dockerfile.10 @@ -1,5 +1,5 @@ FROM postgres:10 -MAINTAINER Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " RUN localedef -i fr_FR -c -f UTF-8 -A /usr/share/locale/locale.alias fr_FR.UTF-8 ENV LANG fr_FR.utf8 diff --git a/postgres/Dockerfile.12 b/postgres/Dockerfile.12 index 92cceda..b3c3373 100644 --- a/postgres/Dockerfile.12 +++ b/postgres/Dockerfile.12 @@ -1,5 +1,5 @@ FROM postgres:12 -MAINTAINER Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " RUN localedef -i fr_FR -c -f UTF-8 -A /usr/share/locale/locale.alias fr_FR.UTF-8 ENV LANG fr_FR.utf8 diff --git a/postgres/Dockerfile.14 b/postgres/Dockerfile.14 index a8a13f2..b55c703 100644 --- a/postgres/Dockerfile.14 +++ b/postgres/Dockerfile.14 @@ -1,5 +1,5 @@ FROM postgres:14 -MAINTAINER Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " RUN localedef -i fr_FR -c -f UTF-8 -A /usr/share/locale/locale.alias fr_FR.UTF-8 ENV LANG fr_FR.utf8 diff --git a/postgres/Dockerfile.84 b/postgres/Dockerfile.84 index f0585d8..c9c645a 100644 --- a/postgres/Dockerfile.84 +++ b/postgres/Dockerfile.84 @@ -1,7 +1,8 @@ FROM oraclelinux:6 -MAINTAINER "Kentaro Ohkouchi" -MAINTAINER "Fabien BOURGEOIS" +LABEL maintainer="Yaltik - Fabien Bourgeois " RUN localedef -i fr_FR -c -f UTF-8 -A /usr/share/locale/locale.alias fr_FR.UTF-8 ENV LANG fr_FR.utf8 diff --git a/postgres/Dockerfile.95 b/postgres/Dockerfile.95 index b9cae87..572d8fc 100644 --- a/postgres/Dockerfile.95 +++ b/postgres/Dockerfile.95 @@ -1,5 +1,5 @@ FROM postgres:9.5 -MAINTAINER Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " RUN localedef -i fr_FR -c -f UTF-8 -A /usr/share/locale/locale.alias fr_FR.UTF-8 ENV LANG fr_FR.utf8 diff --git a/postgres/Dockerfile.96 b/postgres/Dockerfile.96 index 054c60d..7452f0d 100644 --- a/postgres/Dockerfile.96 +++ b/postgres/Dockerfile.96 @@ -1,5 +1,5 @@ FROM postgres:9.6 -MAINTAINER Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " RUN localedef -i fr_FR -c -f UTF-8 -A /usr/share/locale/locale.alias fr_FR.UTF-8 ENV LANG fr_FR.utf8 diff --git a/radicale/Dockerfile b/radicale/Dockerfile index 42e170d..700bb4a 100644 --- a/radicale/Dockerfile +++ b/radicale/Dockerfile @@ -1,15 +1,14 @@ FROM debian:jessie -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # http://bugs.python.org/issue19846 # > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK. ENV LANG C.UTF-8 # Install dependencies -RUN apt-get update && apt-get install -y --no-install-recommends python3 python3-pip - -# Packages cleanup -RUN apt-get purge -y --auto-remove && apt-get clean +RUN apt-get update && \ + apt-get install -y --no-install-recommends python3 python3-pip && \ + apt-get clean && rm -rf /var/lib/apt/lists/* # Create radicale user RUN useradd radicale -md /opt/radicale @@ -19,7 +18,7 @@ USER radicale # Install Radicale # v2.1.9 because of regressions on v2.1.10+ on SSL handling ENV VERSION 2.1.9 -RUN pip3 install --user --upgrade radicale==${VERSION} +RUN pip3 install --user --upgrade --no-cache-dir radicale==${VERSION} COPY config /opt/radicale/radicale.conf RUN mkdir /opt/radicale/storage @@ -30,4 +29,4 @@ VOLUME /opt/radicale/storage EXPOSE 5232 # Run Radicale -CMD .local/bin/radicale --config /opt/radicale/radicale.conf +CMD [".local/bin/radicale", "--config", "/opt/radicale/radicale.conf"] diff --git a/radicale/Dockerfile.c7 b/radicale/Dockerfile.c7 index 5a89d06..8fc6368 100644 --- a/radicale/Dockerfile.c7 +++ b/radicale/Dockerfile.c7 @@ -1,14 +1,15 @@ FROM centos:7 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # http://bugs.python.org/issue19846 # > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK. ENV LANG C.UTF-8 # Install dependencies -RUN yum install -y centos-release-scl -RUN yum-config-manager --enable rhel-server-rhscl-7-rpms -RUN yum install -y rh-python38 +RUN yum install -y centos-release-scl &&\ + yum-config-manager --enable rhel-server-rhscl-7-rpms && \ + yum install -y rh-python38 && \ + yum clean all # Create radicale user RUN useradd radicale -md /opt/radicale WORKDIR /opt/radicale @@ -18,7 +19,7 @@ USER radicale # Was v2.1.9 because of regressions on v2.1.10+ on SSL handling, so no more included SSL ATM # No v3 ATM : huge refacotring, whole plugin obsolete... ENV VERSION 2.1.12 -RUN scl enable rh-python38 "pip install --user radicale==${VERSION}" +RUN scl enable rh-python38 "pip install --user --no-cached-dir radicale==${VERSION}" COPY config .config/radicale/config/ RUN mkdir /opt/radicale/storage diff --git a/radicale/Dockerfile.ol b/radicale/Dockerfile.ol index 3573305..495e4fe 100644 --- a/radicale/Dockerfile.ol +++ b/radicale/Dockerfile.ol @@ -1,12 +1,12 @@ FROM oraclelinux:8 -MAINTAINER Yaltik - Fabien Bourgeois +LABEL maintainer="Yaltik - Fabien Bourgeois " # http://bugs.python.org/issue19846 # > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK. ENV LANG C.UTF-8 # Install dependencies -RUN dnf install -y python3 python3-pip +RUN dnf install -y python3 python3-pip && dnf clean all # Create radicale user RUN useradd radicale -md /opt/radicale WORKDIR /opt/radicale @@ -16,7 +16,7 @@ USER radicale # Was v2.1.9 because of regressions on v2.1.10+ on SSL handling, so no more included SSL ATM # No v3 ATM : huge refactoring, whole plugin obsolete... ENV VERSION 2.1.12 -RUN pip3 install --user radicale==${VERSION} +RUN pip3 install --user --no-cache-dir radicale==${VERSION} COPY config .config/radicale/config RUN mkdir /opt/radicale/storage @@ -27,4 +27,4 @@ VOLUME /opt/radicale/storage EXPOSE 5232 # Run Radicale -CMD .local/bin/radicale --hosts 0.0.0.0:5232 +CMD [".local/bin/radicale", "--hosts", "0.0.0.0:5232"] diff --git a/syncthing/Dockerfile b/syncthing/Dockerfile index 22e31b4..93a1362 100644 --- a/syncthing/Dockerfile +++ b/syncthing/Dockerfile @@ -1,21 +1,19 @@ -FROM golang:1.13 AS builder +FROM golang:bullseye AS builder MAINTAINER Yaltik - Fabien Bourgeois WORKDIR /src COPY . . -ENV CGO_ENABLED=0 -ENV BUILD_HOST=syncthing.net -ENV BUILD_USER=docker +ENV CGO_ENABLED="0" BUILD_HOST="syncthing.net" BUILD_USER="docker" RUN rm -f syncthing && go run build.go -no-upgrade build syncthing FROM alpine -EXPOSE 8384 22000 21027/udp +EXPOSE 8384 22000/tcp 22000/udp 21027/udp VOLUME ["/var/syncthing"] -RUN apk add --no-cache ca-certificates su-exec +RUN apk add --no-cache ca-certificates su-exec tzdata COPY --from=builder /src/syncthing /bin/syncthing COPY --from=builder /src/script/docker-entrypoint.sh /bin/entrypoint.sh