Skip to content

Commit

Permalink
Merge pull request #43 from acsone/slimmer
Browse files Browse the repository at this point in the history 
Make image slightly slimmer
  • Loading branch information
@sbidoul
sbidoul authored Nov 30, 2024
2 parents 4097f02 + 16f8c18 commit 8afc1f6
Show file tree
Hide file tree
Showing 11 changed files with 41 additions and 52 deletions.
7 changes: 3 additions & 4 deletions Dockerfile-10.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,16 @@ ENV \
KWKHTMLTOPDF_SERVER_URL=http://kwkhtmltopdf


COPY ./install /tmp/install
RUN set -x \
RUN --mount=type=bind,source=./install,target=/tmp/install \
set -x \
&& /tmp/install/pre-install.sh \
&& /tmp/install/tools.sh \
&& /tmp/install/gosu.sh \
&& /tmp/install/python2.sh \
&& /tmp/install/lessc.sh \
&& /tmp/install/wkhtmltopdf.sh \
&& /tmp/install/pgdg.sh \
&& /tmp/install/post-install-clean.sh \
&& rm -r /tmp/install
&& /tmp/install/post-install-clean.sh

# isolate from system python libraries
RUN $PYTHONBIN -m virtualenv /odoo
Expand Down
9 changes: 4 additions & 5 deletions Dockerfile-11.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,21 @@ ENV \
KWKHTMLTOPDF_SERVER_URL=http://kwkhtmltopdf


COPY ./install /tmp/install
RUN set -x \
RUN --mount=type=bind,source=./install,target=/tmp/install \
set -x \
&& /tmp/install/pre-install.sh \
&& /tmp/install/tools.sh \
&& /tmp/install/gosu.sh \
&& /tmp/install/python3.sh \
&& /tmp/install/lessc.sh \
&& /tmp/install/wkhtmltopdf.sh \
&& /tmp/install/pgdg.sh \
&& /tmp/install/post-install-clean.sh \
&& rm -r /tmp/install
&& /tmp/install/post-install-clean.sh

# isolate from system python libraries
RUN set -x \
&& $PYTHONBIN -m venv /odoo \
&& /odoo/bin/pip install -U pip wheel setuptools
&& /odoo/bin/pip install --no-cache-dir -U pip wheel setuptools
ENV PATH=/odoo/bin:$PATH
ENV VIRTUAL_ENV=/odoo

Expand Down
9 changes: 4 additions & 5 deletions Dockerfile-12.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,20 @@ ENV \
KWKHTMLTOPDF_SERVER_URL=http://kwkhtmltopdf


COPY ./install /tmp/install
RUN set -x \
RUN --mount=type=bind,source=./install,target=/tmp/install \
set -x \
&& /tmp/install/pre-install.sh \
&& /tmp/install/tools.sh \
&& /tmp/install/gosu.sh \
&& /tmp/install/python3.sh \
&& /tmp/install/wkhtmltopdf.sh \
&& /tmp/install/pgdg.sh \
&& /tmp/install/post-install-clean.sh \
&& rm -r /tmp/install
&& /tmp/install/post-install-clean.sh

# isolate from system python libraries
RUN set -x \
&& $PYTHONBIN -m venv /odoo \
&& /odoo/bin/pip install -U pip wheel setuptools
&& /odoo/bin/pip install --no-cache-dir -U pip wheel setuptools
ENV PATH=/odoo/bin:$PATH
ENV VIRTUAL_ENV=/odoo

Expand Down
9 changes: 4 additions & 5 deletions Dockerfile-13.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,20 @@ ENV \
KWKHTMLTOPDF_SERVER_URL=http://kwkhtmltopdf


COPY ./install /tmp/install
RUN set -x \
RUN --mount=type=bind,source=./install,target=/tmp/install \
set -x \
&& /tmp/install/pre-install.sh \
&& /tmp/install/tools.sh \
&& /tmp/install/gosu.sh \
&& /tmp/install/python3.sh \
&& /tmp/install/wkhtmltopdf.sh \
&& /tmp/install/pgdg.sh \
&& /tmp/install/post-install-clean.sh \
&& rm -r /tmp/install
&& /tmp/install/post-install-clean.sh

# isolate from system python libraries
RUN set -x \
&& $PYTHONBIN -m venv /odoo \
&& /odoo/bin/pip install -U pip wheel setuptools
&& /odoo/bin/pip install --no-cache-dir -U pip wheel setuptools
ENV PATH=/odoo/bin:$PATH
ENV VIRTUAL_ENV=/odoo

Expand Down
9 changes: 4 additions & 5 deletions Dockerfile-14.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,20 @@ ENV \
KWKHTMLTOPDF_SERVER_URL=http://kwkhtmltopdf


COPY ./install /tmp/install
RUN set -x \
RUN --mount=type=bind,source=./install,target=/tmp/install \
set -x \
&& /tmp/install/pre-install.sh \
&& /tmp/install/tools.sh \
&& /tmp/install/gosu.sh \
&& /tmp/install/python3.sh \
&& /tmp/install/wkhtmltopdf.sh \
&& /tmp/install/pgdg.sh \
&& /tmp/install/post-install-clean.sh \
&& rm -r /tmp/install
&& /tmp/install/post-install-clean.sh

# isolate from system python libraries
RUN set -x \
&& $PYTHONBIN -m venv /odoo \
&& /odoo/bin/pip install -U pip wheel setuptools
&& /odoo/bin/pip install --no-cache-dir -U pip wheel setuptools
ENV PATH=/odoo/bin:$PATH
ENV VIRTUAL_ENV=/odoo

Expand Down
9 changes: 4 additions & 5 deletions Dockerfile-15.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,20 @@ ENV \
KWKHTMLTOPDF_SERVER_URL=http://kwkhtmltopdf


COPY ./install /tmp/install
RUN set -x \
RUN --mount=type=bind,source=./install,target=/tmp/install \
set -x \
&& /tmp/install/pre-install.sh \
&& /tmp/install/tools.sh \
&& /tmp/install/gosu.sh \
&& /tmp/install/python3.sh \
&& /tmp/install/wkhtmltopdf.sh \
&& /tmp/install/pgdg.sh \
&& /tmp/install/post-install-clean.sh \
&& rm -r /tmp/install
&& /tmp/install/post-install-clean.sh

# isolate from system python libraries
RUN set -x \
&& $PYTHONBIN -m venv /odoo \
&& /odoo/bin/pip install -U pip wheel setuptools
&& /odoo/bin/pip install --no-cache-dir -U pip wheel setuptools
ENV PATH=/odoo/bin:$PATH
ENV VIRTUAL_ENV=/odoo

Expand Down
9 changes: 4 additions & 5 deletions Dockerfile-16.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,20 @@ ENV \
KWKHTMLTOPDF_SERVER_URL=http://kwkhtmltopdf


COPY ./install /tmp/install
RUN set -x \
RUN --mount=type=bind,source=./install,target=/tmp/install \
set -x \
&& /tmp/install/pre-install.sh \
&& /tmp/install/tools.sh \
&& /tmp/install/gosu.sh \
&& /tmp/install/python3.sh \
&& /tmp/install/wkhtmltopdf.sh \
&& /tmp/install/pgdg.sh \
&& /tmp/install/post-install-clean.sh \
&& rm -r /tmp/install
&& /tmp/install/post-install-clean.sh

# isolate from system python libraries
RUN set -x \
&& $PYTHONBIN -m venv /odoo \
&& /odoo/bin/pip install -U pip wheel setuptools
&& /odoo/bin/pip install --no-cache-dir -U pip wheel setuptools
ENV PATH=/odoo/bin:$PATH
ENV VIRTUAL_ENV=/odoo

Expand Down
9 changes: 4 additions & 5 deletions Dockerfile-17.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,20 @@ ENV \
KWKHTMLTOPDF_SERVER_URL=http://kwkhtmltopdf


COPY ./install /tmp/install
RUN set -x \
RUN --mount=type=bind,source=./install,target=/tmp/install \
set -x \
&& /tmp/install/pre-install.sh \
&& /tmp/install/tools.sh \
&& /tmp/install/gosu.sh \
&& /tmp/install/python3.sh \
&& /tmp/install/wkhtmltopdf.sh \
&& /tmp/install/pgdg.sh \
&& /tmp/install/post-install-clean.sh \
&& rm -r /tmp/install
&& /tmp/install/post-install-clean.sh

# isolate from system python libraries
RUN set -x \
&& $PYTHONBIN -m venv /odoo \
&& /odoo/bin/pip install -U pip wheel setuptools
&& /odoo/bin/pip install --no-cache-dir -U pip wheel setuptools
ENV PATH=/odoo/bin:$PATH
ENV VIRTUAL_ENV=/odoo

Expand Down
9 changes: 4 additions & 5 deletions Dockerfile-18.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,20 @@ ENV \
KWKHTMLTOPDF_SERVER_URL=http://kwkhtmltopdf


COPY ./install /tmp/install
RUN set -x \
RUN --mount=type=bind,source=./install,target=/tmp/install \
set -x \
&& /tmp/install/pre-install.sh \
&& /tmp/install/tools.sh \
&& /tmp/install/gosu.sh \
&& /tmp/install/python3.sh \
&& /tmp/install/wkhtmltopdf.sh \
&& /tmp/install/pgdg.sh \
&& /tmp/install/post-install-clean.sh \
&& rm -r /tmp/install
&& /tmp/install/post-install-clean.sh

# isolate from system python libraries
RUN set -x \
&& $PYTHONBIN -m venv /odoo \
&& /odoo/bin/pip install -U pip
&& /odoo/bin/pip install --no-cache-dir -U pip
ENV PATH=/odoo/bin:$PATH
ENV VIRTUAL_ENV=/odoo

Expand Down
7 changes: 3 additions & 4 deletions Dockerfile-8.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,16 @@ ENV \
DEBIAN_FRONTEND=noninteractive \
KWKHTMLTOPDF_SERVER_URL=http://kwkhtmltopdf

COPY ./install /tmp/install
RUN set -x \
RUN --mount=type=bind,source=./install,target=/tmp/install \
set -x \
&& /tmp/install/pre-install.sh \
&& /tmp/install/tools.sh \
&& /tmp/install/gosu.sh \
&& /tmp/install/python2.sh \
&& /tmp/install/lessc.sh \
&& /tmp/install/wkhtmltopdf.sh \
&& /tmp/install/pgdg.sh \
&& /tmp/install/post-install-clean.sh \
&& rm -r /tmp/install
&& /tmp/install/post-install-clean.sh

# isolate from system python libraries
RUN $PYTHONBIN -m virtualenv /odoo
Expand Down
7 changes: 3 additions & 4 deletions Dockerfile-9.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,16 @@ ENV \
KWKHTMLTOPDF_SERVER_URL=http://kwkhtmltopdf


COPY ./install /tmp/install
RUN set -x \
RUN --mount=type=bind,source=./install,target=/tmp/install \
set -x \
&& /tmp/install/pre-install.sh \
&& /tmp/install/tools.sh \
&& /tmp/install/gosu.sh \
&& /tmp/install/python2.sh \
&& /tmp/install/lessc.sh \
&& /tmp/install/wkhtmltopdf.sh \
&& /tmp/install/pgdg.sh \
&& /tmp/install/post-install-clean.sh \
&& rm -r /tmp/install
&& /tmp/install/post-install-clean.sh

# isolate from system python libraries
RUN $PYTHONBIN -m virtualenv /odoo
Expand Down

0 comments on commit 8afc1f6

Please sign in to comment.