Skip to content

Commit 3e5331d

Browse files
committed
Apply available focal security updates at build time
Add DEBIAN_FRONTEND=noninteractive apt-get upgrade -y between the PGDG source removal and the r-base install so the image picks up whatever patches are still flowing into focal-updates and focal-security. Tidy the layer with apt-get clean and rm -rf /var/lib/apt/lists/*. ESM-only CVEs are not covered (no Pro token inside the build). The longer-term fix is to rebase catmaid/catmaid-standalone on jammy or noble; see the Trivy scan report for what we're inheriting from focal in the meantime.
1 parent 2946d35 commit 3e5331d

1 file changed

Lines changed: 10 additions & 1 deletion

File tree

Dockerfile

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,18 @@ RUN chmod +x /opt/VFB/*.sh
3737
# Ubuntu 20.04 hit standard EOL — its Release file is gone, so apt-get
3838
# update aborts. Postgres is already installed in the base image, so we
3939
# just disable the PGDG source before running update.
40+
#
41+
# focal is past standard support; we apply what patches still flow into
42+
# focal-updates/focal-security with apt-get upgrade. ESM-only CVEs (e.g.
43+
# many libssl, openssh, glibc fixes after April 2025) require an Ubuntu
44+
# Pro token which we don't ship; the longer-term fix is to rebase
45+
# catmaid-standalone on jammy or noble.
4046
RUN rm -f /etc/apt/sources.list.d/pgdg.list /etc/apt/sources.list.d/postgresql.list \
4147
&& apt-get update \
42-
&& apt-get install -y r-base
48+
&& DEBIAN_FRONTEND=noninteractive apt-get upgrade -y \
49+
&& apt-get install -y r-base \
50+
&& apt-get clean \
51+
&& rm -rf /var/lib/apt/lists/*
4352

4453
ENV INSTANCE_MEMORY=65000
4554

0 commit comments

Comments
 (0)