Skip to content

Commit 344327c

Browse files
authored
Install OSG certificates in xrootd did finder container (#1130)
1 parent fd3a720 commit 344327c

File tree

4 files changed

+24
-10
lines changed

4 files changed

+24
-10
lines changed

did_finder_xrootd/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.10
1+
FROM debian:trixie
22

33
LABEL maintainer="Peter Onyisi <[email protected]>"
44

@@ -11,9 +11,8 @@ RUN useradd -g 0 -ms /bin/bash celery
1111
ENV POETRY_VERSION=2.1.1
1212

1313
RUN apt-get update && \
14-
apt-get install cmake --no-install-recommends --assume-yes
14+
apt-get install cmake osg-ca-certs python3-poetry python3-dev build-essential uuid-dev libssl-dev --no-install-recommends --assume-yes
1515

16-
RUN pip install poetry==$POETRY_VERSION
1716
RUN mkdir -p /opt/servicex/pypoetry
1817
COPY pyproject.toml pyproject.toml
1918
COPY poetry.lock poetry.lock
@@ -39,6 +38,8 @@ ENV PYTHONUNBUFFERED=1
3938
ENV PYTHONPATH=/opt/servicex/src
4039

4140
ENV BROKER_URL="amqp://guest:guest@localhost:5672//"
41+
ENV X509_USER_PROXY=/etc/grid-security-ro/x509up
42+
ENV X509_CERT_DIR=/etc/grid-security/certificates
4243

4344

4445
ENTRYPOINT [ "scripts/start_celery_worker.sh"]

did_finder_xrootd/poetry.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

did_finder_xrootd/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ packages = [{include = "src/servicex_did_finder_xrootd"}]
99
[tool.poetry.dependencies]
1010
python = ">=3.10,<4.0"
1111
servicex-did-finder-lib = "^3.0.0"
12-
xrootd = ">=5.6.9"
12+
xrootd = ">=5.8.3"
1313

1414
[tool.poetry.group.test]
1515
optional = true

helm/servicex/templates/did-finder-xrootd/deployment.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,17 @@ spec:
3939
- name: BROKER_URL
4040
value: amqp://user:{{ .Values.rabbitmq.auth.password }}@{{ .Release.Name }}-rabbitmq:5672/%2F
4141
{{- end }}
42+
{{ if not .Values.noCerts}}
43+
volumeMounts:
44+
- name: x509-secret
45+
mountPath: /etc/grid-security-ro
46+
readOnly: true
47+
{{- end }}
48+
{{ if not .Values.noCerts}}
49+
volumes:
50+
- name: x509-secret
51+
secret:
52+
defaultMode: 292
53+
secretName: x509-proxy
54+
{{- end }}
4255
{{ end }}

0 commit comments

Comments
 (0)