From 0786e0fd203da28bef40eddaa9a67a2a875cc4f4 Mon Sep 17 00:00:00 2001
From: Julien Bigot <julien.bigot@cea.fr>
Date: Sat, 31 Aug 2024 15:53:26 +0200
Subject: [PATCH] remove non deps

---
 spack/3a-precomp/baselibs.lst |  6 -----
 spack/6-optlibs/optlibs.lst   |  1 -
 spack/7-finalize/Dockerfile   | 42 +++++++++++++++++++++++++++++++++--
 3 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/spack/3a-precomp/baselibs.lst b/spack/3a-precomp/baselibs.lst
index 57c28f9..ef99739 100644
--- a/spack/3a-precomp/baselibs.lst
+++ b/spack/3a-precomp/baselibs.lst
@@ -1,11 +1,5 @@
 cmake
-curl
 doxygen
-m4
-openssl +shared certs=mozilla
 pkgconf
 py-numpy
-py-pip
-py-pyyaml ~libyaml
 python
-zlib
diff --git a/spack/6-optlibs/optlibs.lst b/spack/6-optlibs/optlibs.lst
index 02842af..46cc119 100644
--- a/spack/6-optlibs/optlibs.lst
+++ b/spack/6-optlibs/optlibs.lst
@@ -1,5 +1,4 @@
 hdf5
-libyaml
 netcdf-c
 paraconf
 py-pybind11
diff --git a/spack/7-finalize/Dockerfile b/spack/7-finalize/Dockerfile
index ca04848..e08460e 100644
--- a/spack/7-finalize/Dockerfile
+++ b/spack/7-finalize/Dockerfile
@@ -144,8 +144,46 @@ ENV HOME=/home/ci
 
 FROM main AS test
 
-RUN curl --output pdi.tar.bz2 https://gitlab.maisondelasimulation.fr/pdidev/pdi/-/archive/builderv3/pdi.tar.bz2
-RUN tar -xf pdi.tar.bz2
+
+USER root:root
+WORKDIR /root
+ENV HOME=/root
+
+RUN set -ex \
+ && export DEBIAN_FRONTEND=noninteractive \
+ && apt-get update -y \
+ && apt-get upgrade -y \
+ && apt-get install -y --no-install-recommends \
+            ca-certificates \
+            curl \
+ && apt-get autoremove -y \
+ && apt-get clean -y \
+ && apt-get autoclean -y
+
+USER ci:ci
+WORKDIR /home/ci
+ENV HOME=/home/ci
+
+RUN curl --output pdi.tar.gz https://github.com/pdidev/pdi/archive/refs/heads/main.gz
+
+
+USER root:root
+WORKDIR /root
+ENV HOME=/root
+
+RUN set -ex \
+ && export DEBIAN_FRONTEND=noninteractive \
+ && apt-get purge -y \
+            ca-certificates \
+            curl \
+ && rm -rf /var/lib/apt/lists/*
+
+USER ci:ci
+WORKDIR /home/ci
+ENV HOME=/home/ci
+
+
+RUN tar -xf pdi.tar.gz
 RUN export VERBOSE=1 \
  && bash pdi*/tools/build_scripts/build_and_run.sh