Skip to content

Commit

Permalink
Remove leftover xcache pieces from worker dockefile
Browse files Browse the repository at this point in the history
  • Loading branch information
oshadura committed Feb 9, 2023
1 parent 28d5c55 commit e3ae536
Showing 1 changed file with 3 additions and 13 deletions.
16 changes: 3 additions & 13 deletions docker/Dockerfile.cc-analysis-ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ ARG NB_GID="11265"
ARG CERT_DIR="/etc/cmsaf-secrets"
# Hack for GH Actions
ARG GITHUB_ACTIONS="false"
# For now bearer token location on worker is hardcoded "$_CONDOR_JOB_IWD/xcache_token"
ARG BEARER_TOKEN_FILE

# For now bearer token location on worker is hardcoded "$_CONDOR_JOB_IWD/xcache_token"
# For now bearer token location on worker is hardcoded
# in coffea_casa module as environment"$_CONDOR_JOB_IWD/xcache_token"

# Configure environment
ENV CERT_DIR $CERT_DIR
ENV BEARER_TOKEN_FILE "$_CONDOR_JOB_IWD/access_token"
ENV CONDA_DIR /opt/conda
ENV SHELL /bin/bash
ENV NB_USER $NB_USER
Expand Down Expand Up @@ -147,10 +146,6 @@ EOF

RUN ln -s /etc/grid-security/certificates/hcc-flatiron.pem /etc/grid-security/certificates/80d1fda9.0

# REMOVE ME AFTER TEST:
# xcache setup
#ENV XRD_PLUGINCONFDIR="${CONDA_DIR}/etc/xrootd/client.plugins.d/"
#ENV XRD_PLUGIN="${CONDA_DIR}/lib/libXrdClAuthzPlugin.so"
# TODO: RETEST IF WE STILL NEED THIS
ENV LD_LIBRARY_PATH="/opt/conda/lib/:$LD_LIBRARY_PATH"
ENV PATH="/opt/conda/bin/:$PATH"
Expand All @@ -165,11 +160,6 @@ COPY k8s-worker/supervisord.conf /etc/supervisor/
RUN groupadd -r condor && \
useradd -r -g condor -d /var/lib/condor -s /sbin/nologin condor

# REMOVE ME AFTER TEST:
# Patching uproot (broken xrootd-authz-plugin with xrootd > 5.2.0 and uproot.MultithreadedXRootDSource)
#COPY uproot/uproot_xrd_source.patch /opt/conda/lib/python3.8/site-packages/uproot
#RUN cd /opt/conda/lib/python3.8/site-packages/uproot && patch < uproot_xrd_source.patch

# FIXME: merge PRs open in distributed.git (oshadura)
# Distributed: we need to install patched version of distributed version
COPY dask/distributed /opt/conda/lib/python3.8/site-packages/distributed
Expand Down

0 comments on commit e3ae536

Please sign in to comment.