From 53497e33726b7d4c3102938d7a70c680484c4431 Mon Sep 17 00:00:00 2001
From: Oksana Shadura <ksu.shadura@gmail.com>
Date: Wed, 22 Nov 2023 15:10:05 +0100
Subject: [PATCH] Revert "Reshuffle dockerfile (we are also retriggering
 builds)"

This reverts commit e26b17a4758f28ee3cc3b5492fc1c27ae8b1229c.
---
 docker/Dockerfile.cc-base-ubuntu | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/docker/Dockerfile.cc-base-ubuntu b/docker/Dockerfile.cc-base-ubuntu
index a21cefa6..b315773b 100644
--- a/docker/Dockerfile.cc-base-ubuntu
+++ b/docker/Dockerfile.cc-base-ubuntu
@@ -208,6 +208,14 @@ RUN jupyter labextension install @jupyter-widgets/jupyterlab-manager && \
 #COPY jupyterlab-workspace.json $HOME/
 #RUN jupyter lab workspaces import $HOME/jupyterlab-workspace.json
 
+USER root
+# Preparing directories for Dask conf files, patches and job spool directory for HTCondor
+RUN mkdir -p ${DASK_ROOT_CONFIG}  && chown -R "${NB_USER}:${NB_GID}" ${DASK_ROOT_CONFIG} && \
+    mkdir -p /opt/condor/config.d  && chown -R "${NB_USER}:${NB_GID}" /opt/condor/config.d && \
+    mkdir -p ${HOME}/.condor/tokens.d && \
+    mkdir -p /var/lib/condor && \
+    mkdir -p /etc/condor/config.d
+
 USER ${NB_UID}
 
 RUN mamba install --yes \
@@ -230,13 +238,11 @@ RUN mamba install --yes \
         --force-pkgs-dirs \
         --yes
 
+USER ${NB_UID}
+# Dask, Labextention and coffea-casa setup
+COPY dask/dask.yaml dask/labextension.yaml ${DASK_ROOT_CONFIG}/
+
 USER root
-# Preparing directories for Dask conf files, patches and job spool directory for HTCondor
-RUN mkdir -p ${DASK_ROOT_CONFIG}  && chown -R "${NB_USER}:${NB_GID}" ${DASK_ROOT_CONFIG} && \
-    mkdir -p /opt/condor/config.d  && chown -R "${NB_USER}:${NB_GID}" /opt/condor/config.d && \
-    mkdir -p ${HOME}/.condor/tokens.d && \
-    mkdir -p /var/lib/condor && \
-    mkdir -p /etc/condor/config.d
 # Add HTCondor configuration files that not needed to be edited
 COPY condor/condor_config /etc/condor/
 COPY condor/config.d  /etc/condor/config.d/
@@ -265,10 +271,7 @@ RUN rm -rf /opt/conda/condabin && ln -s /opt/conda/bin /opt/conda/condabin
 # if not utilized, crucial if CVMFS is desired
 RUN mkdir /cvmfs
 
-USER ${NB_USER}  
-# Dask, Labextention and coffea-casa setup
-COPY dask/dask.yaml dask/labextension.yaml ${DASK_ROOT_CONFIG}/
-
+USER ${NB_USER}    
 RUN pip install --no-cache-dir \
     correctionlib \
     funcx \