diff --git a/.github/workflows/dockerci-dev.yml b/.github/workflows/dockerci-dev.yml index a1f07055..f9f90819 100644 --- a/.github/workflows/dockerci-dev.yml +++ b/.github/workflows/dockerci-dev.yml @@ -57,7 +57,7 @@ jobs: platforms: linux/amd64 tags: ${{ env.REGISTRY }}/coffea-casa/${{ matrix.image }}:${{ steps.date.outputs.date }} build-args: | - DEV=true TAG=${{ steps.date.outputs.date }} PROJECT=${{ env.PROJECT }} GITHUB_ACTIONS=${{ env.GITHUB_ACTIONS }} + REGISTRY=${{ env.REGISTRY }} diff --git a/docker/Dockerfile.cc-analysis-ubuntu b/docker/Dockerfile.cc-analysis-ubuntu index 5c341736..ac1e5dbd 100644 --- a/docker/Dockerfile.cc-analysis-ubuntu +++ b/docker/Dockerfile.cc-analysis-ubuntu @@ -149,9 +149,6 @@ ENV XRD_PLUGIN="${CONDA_DIR}/lib/libXrdClXcachePlugin-5.so" #ENV XRD_PLUGINCONFDIR="${CONDA_DIR}/etc/xrootd/client.plugins.d/" #ENV XRD_PLUGIN="${CONDA_DIR}/lib/libXrdClAuthzPlugin.so" -# 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 RUN chmod 755 /etc/grid-security/certificates COPY certs/hcc-flatiron.pem /etc/grid-security/certificates/ diff --git a/docker/Dockerfile.cc-base-ubuntu b/docker/Dockerfile.cc-base-ubuntu index 27032189..42248e49 100644 --- a/docker/Dockerfile.cc-base-ubuntu +++ b/docker/Dockerfile.cc-base-ubuntu @@ -301,10 +301,6 @@ RUN cd /tmp && \ ENV XRD_PLUGINCONFDIR="${CONDA_DIR}/etc/xrootd/client.plugins.d/" ENV XRD_PLUGIN="${CONDA_DIR}/lib/libXrdClXcachePlugin-5.so" -# 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 - RUN chmod 755 /etc/grid-security/certificates COPY certs/hcc-flatiron.pem /etc/grid-security/certificates/ RUN ln -s /etc/grid-security/certificates/hcc-flatiron.pem /etc/grid-security/certificates/80d1fda9.0