Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make image slightly slimmer #43

Merged
merged 2 commits into from
Nov 30, 2024
Merged

Make image slightly slimmer #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e5a78d
Disable pip cache when upgrading pip, etc
sbidoul Nov 30, 2024
16f8c18
Use bind mount to access install scripts
sbidoul Nov 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions Dockerfile-10.0
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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