From dc9b89b56d3e628cd0cee4c7d68817342d91aadf Mon Sep 17 00:00:00 2001 From: mjanez <96422458+mjanez@users.noreply.github.com> Date: Thu, 8 Feb 2024 12:54:25 +0100 Subject: [PATCH] Improve Dockerfiles - Using warnings/info from Lint: https://github.com/mjanez/ckan-mqa/actions/runs/7829021697 --- ckan-mqa/Dockerfile | 8 ++++---- ckan-mqa/Dockerfile.dev | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ckan-mqa/Dockerfile b/ckan-mqa/Dockerfile index 6095d7c..a6e7e06 100644 --- a/ckan-mqa/Dockerfile +++ b/ckan-mqa/Dockerfile @@ -10,11 +10,11 @@ ENV DEV_MODE=False ENV TIMEOUT=20 RUN apt-get -q -y update && \ - apt-get install -y wget && \ - DEBIAN_FRONTEND=noninteractive apt-get -yq install gettext-base && \ - wget -O /wait-for https://raw.githubusercontent.com/eficode/wait-for/v2.2.3/wait-for && \ + apt-get install -y --no-install-recommends wget=1.21.3-1 gettext-base=0.21-12 && \ + rm -rf /var/lib/apt/lists/* && \ + wget --progress=dot:giga -O /wait-for https://raw.githubusercontent.com/eficode/wait-for/v2.2.3/wait-for && \ chmod +x /wait-for && \ - python3 -m pip install pdm + python3 -m pip install --no-cache-dir pdm==2.12.3 WORKDIR ${APP_DIR} COPY pyproject.toml pdm.lock ./ diff --git a/ckan-mqa/Dockerfile.dev b/ckan-mqa/Dockerfile.dev index e31cea2..e7daf09 100644 --- a/ckan-mqa/Dockerfile.dev +++ b/ckan-mqa/Dockerfile.dev @@ -10,11 +10,11 @@ ENV DEV_MODE=True ENV TIMEOUT=10 RUN apt-get -q -y update && \ - apt-get install -y wget procps && \ - DEBIAN_FRONTEND=noninteractive apt-get -yq install gettext-base && \ - wget -O /wait-for https://raw.githubusercontent.com/eficode/wait-for/v2.2.3/wait-for && \ + apt-get install -y --no-install-recommends wget=1.21.3-1 procps=2:4.0.2-3 gettext-base=0.21-12 && \ + rm -rf /var/lib/apt/lists/* && \ + wget --progress=dot:giga -O /wait-for https://raw.githubusercontent.com/eficode/wait-for/v2.2.3/wait-for && \ chmod +x /wait-for && \ - python3 -m pip install pdm debugpy + python3 -m pip install --no-cache-dir pdm==2.12.3 debugpy==1.8.0 WORKDIR ${APP_DIR} COPY pyproject.toml pdm.lock ./