Merge pull request #979 from biorack/main

Catch untargeted branch up to main to fix deployment (git and git-man version error)
biorack · Nov 12, 2024 · 132229c · 132229c
2 parents 34bb916 + 2b7b536
commit 132229c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/docker/Dockerfile.ci b/docker/Dockerfile.ci
@@ -83,9 +83,9 @@ EXPOSE 8888
 
 RUN apt-get update \
     && apt-get install --yes --no-install-recommends \
-          "libxrender1=1:0.9.10-1" \
+      "libxrender1=1:0.9.10-1" \
 	  "libxext6=2:1.3.3-1.1" \
-	  "git=1:2.30.2-1+deb11u2" \
+	  "git=1:2.39.5-0+deb12u1" \
     && rm -rf /var/lib/apt/lists/*
 
 # hadolint ignore=DL3021

diff --git a/docker/Dockerfile.shifter b/docker/Dockerfile.shifter
@@ -2,10 +2,10 @@ FROM python:3.11-slim-bookworm
 
 RUN apt-get update \
     && apt-get install --yes --no-install-recommends \
-          "libxrender1=1:0.9.10-1.1" \
+    "libxrender1=1:0.9.10-1.1" \
 	  "libxext6=2:1.3.4-1+b1" \
-	  "git=1:2.39.2-1.1" \
-      "git-man=1:2.39.2-1.1" \
+	  "git=1:2.39.5-0+deb12u1" \
+    "git-man=1:2.39.5-0+deb12u1" \
     && rm -rf /var/lib/apt/lists/*
 
 COPY requirements.txt /requirements.txt