Merge pull request #11 from mjanez/latest

Fix Dockerfiles
mjanez · Feb 8, 2024 · c7a9310 · c7a9310
2 parents 5195c1a + b2f7c83
commit c7a9310
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/ckan-mqa/Dockerfile b/ckan-mqa/Dockerfile
@@ -10,7 +10,7 @@ ENV DEV_MODE=False
 ENV TIMEOUT=20
 
 RUN apt-get -q -y update && \
-    apt-get install -y --no-install-recommends wget=1.21.3-1 gettext-base=0.21-12 && \
+    apt-get install -y --no-install-recommends wget=1.21.3-1+b2 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 && \
@@ -22,6 +22,6 @@ COPY pyproject.toml pdm.lock ./
 RUN pdm install --no-self --group prod
 
 COPY ckan-mqa/docker-entrypoint.d/entrypoint.sh entrypoint.sh
-COPY ./ckan2mqa /ckan2mqa
+COPY ckan2mqa ckan2mqa
 
 ENTRYPOINT ["/bin/bash", "./entrypoint.sh"]
diff --git a/ckan-mqa/Dockerfile.dev b/ckan-mqa/Dockerfile.dev
@@ -10,19 +10,19 @@ ENV DEV_MODE=True
 ENV TIMEOUT=10
 
 RUN apt-get -q -y update && \
-    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 && \
+    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 && \
     chmod +x /wait-for && \
-    python3 -m pip install --no-cache-dir pdm==2.12.3 debugpy==1.8.0
+    python3 -m pip install pdm debugpy
 
 WORKDIR ${APP_DIR}
 COPY pyproject.toml pdm.lock ./
 
 RUN pdm install --no-self --group prod
 
 COPY ckan-mqa/docker-entrypoint.d/entrypoint_dev.sh entrypoint.sh
-COPY ./ckan2mqa /ckan2mqa
+COPY ckan2mqa ckan2mqa
 
 EXPOSE 5678/TCP