Skip to content

Commit

Permalink
Update xcache and rebuild image to last one
Browse files Browse the repository at this point in the history
  • Loading branch information
oshadura committed Jul 23, 2024
1 parent 023d160 commit 3c708b6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
7 changes: 2 additions & 5 deletions docker/Dockerfile.cc-analysis-alma9
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#FROM coffeateam/coffea-base-almalinux8:0.7.22-py3.10
FROM coffeateam/coffea-dask-almalinux9:latest-py3.10


USER root
LABEL maintainer="Oksana Shadura <[email protected]>"
# Jupyterhub
Expand All @@ -15,10 +16,9 @@ ARG GITHUB_ACTIONS="false"
#ARG BEARER_TOKEN_FILE="/tmp/.xcache/access_token"
ARG BEARER_TOKEN_FILE="/tmp/.xcache/access_token"
ARG SEC_TOKEN_SYSTEM_DIRECTORY="/tmp/.condor"
ARG XCACHE_HOST="xcache"
ARG XCACHE_HOST="xcache.cmsaf-dev.flatiron.hollandhpc.org"
#ARG XCACHE_HOST="red-xcache1.unl.edu"


# Configure environment
ENV CONDA_DIR /usr/local
ENV CERT_DIR $CERT_DIR
Expand Down Expand Up @@ -113,12 +113,9 @@ RUN mkdir $HOME/work && \
mkdir -p $HOME/.condor/tokens.d && \
fix-permissions $HOME

RUN mamba remove htcondor

#Dask dependencies and HTCondor
RUN mamba install --yes \
-c conda-forge \
htcondor==10.8.0 \
xgboost \
pyhf \
xrootd \
Expand Down
8 changes: 3 additions & 5 deletions docker/Dockerfile.cc-dask-alma9
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ FROM coffeateam/coffea-dask-almalinux9:latest-py3.10
# Fix DL4006
SHELL ["/bin/bash", "-o", "pipefail", "-c"]


USER root
LABEL maintainer="Oksana Shadura <[email protected]>"
# Jupyterhub
Expand All @@ -25,15 +26,14 @@ ARG UID_DOMAIN="unl.edu"
ARG SCHEDD_HOST="t3.unl.edu"
# XCACHE
#ARG XCACHE_HOST="red-xcache1.unl.edu"
ARG XCACHE_HOST="xcache"
ARG XCACHE_HOST="xcache.cmsaf-dev.flatiron.hollandhpc.org"
# FIX ME AFTER TEST:
ARG BEARER_TOKEN_FILE="/etc/cmsaf-secrets-chown/access_token"
# Tag
ARG TAG="development"
ARG PROJECT="coffea-casa"
ARG REGISTRY="hub.opensciencegrid.org"
ARG WORKER_IMAGE="${REGISTRY}/${PROJECT}/cc-analysis-alma8"

# Hack for GH Actions
ARG GITHUB_ACTIONS="false"

Expand Down Expand Up @@ -138,8 +138,7 @@ RUN mkdir "/home/${NB_USER}/work" && \
# Correct permissions
# Do all this in a single RUN command to avoid duplicating all of the
# files across image layers when the permissions change
RUN mamba remove htcondor && \
mamba install --quiet --yes \
RUN mamba install --quiet --yes \
-c conda-forge \
'notebook'==6.5.3 \
'jupyterhub'==3.1.1 \
Expand All @@ -149,7 +148,6 @@ RUN mamba remove htcondor && \
jupyter_client==8.1.0 \
jupyterlab_widgets \
nodejs \
htcondor==10.8.0 \
ipywidgets==8.0.6 && \
mamba clean \
--all \
Expand Down

0 comments on commit 3c708b6

Please sign in to comment.