From 5797d777a0c97e3a9df79ed811d7bd8af1e7b7e2 Mon Sep 17 00:00:00 2001
From: Alexander Pace <alexander.pace@ligo.org>
Date: Thu, 20 Mar 2025 19:16:35 +0000
Subject: [PATCH] fix {ligo,osg}-ca-certs installation
---
Dockerfile | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 4574f44e4..314a55ea8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,6 +12,7 @@ RUN apt-get update && \
RUN echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list
RUN echo 'deb http://apt.postgresql.org/pub/repos/apt bookworm-pgdg main' > /etc/apt/sources.list.d/pgdg.list
+RUN echo 'deb [trusted=yes] https://hypatia.aei.mpg.de/lsc-amd64-bookworm ./' > /etc/apt/sources.list.d/lscsoft.list
RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
RUN apt-get update && \
apt-get --assume-yes upgrade && \
@@ -35,6 +36,8 @@ RUN apt-get update && \
libfreetype6-dev \
libxslt-dev \
libsqlite3-dev \
+ ligo-ca-certs \
+ osg-ca-certs \
php \
php8.2-pgsql \
php8.2-mbstring \
@@ -61,16 +64,6 @@ RUN curl -O https://s3.us-east-2.amazonaws.com/aws-xray-assets.us-east-2/xray-da
RUN dpkg -i aws-xray-daemon-3.x.deb
RUN rm aws-xray-daemon-3.x.deb
-# Install osg-ca-certs:
-RUN curl -O https://hypatia.aei.mpg.de/lsc-amd64-bookworm/osg-ca-certs_1.132NEW-1+deb12u0_all.deb
-RUN dpkg -i osg-ca-certs_1.132NEW-1+deb12u0_all.deb
-RUN rm osg-ca-certs_1.132NEW-1+deb12u0_all.deb
-
-# Install ligo-ca-certs:
-RUN curl -O https://hypatia.aei.mpg.de/lsc-amd64-bookworm/ligo-ca-certs_1.0.2-0+deb12u0_all.deb
-RUN dpkg -i ligo-ca-certs_1.0.2-0+deb12u0_all.deb
-RUN rm ligo-ca-certs_1.0.2-0+deb12u0_all.deb
-
# Docker scripts:
COPY docker/entrypoint /usr/local/bin/entrypoint
COPY docker/cleanup /usr/local/bin/cleanup
--
GitLab