From 6ce52a5917d24414d9816be150b1b9fccf2f42a2 Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Sun, 15 Mar 2020 18:30:43 -0500 Subject: [PATCH 1/6] Add test of what is in PATH --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bae6efe..8bcae96 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,6 +22,9 @@ jobs: --tag pyhf/pyhf-validation-root-base:$GITHUB_SHA \ --compress docker images + - name: Check PATH + run: | + docker run --rm pyhf/pyhf-validation-root-base:$GITHUB_SHA -c "which python;python --version;which root;root-config --version" - name: Run tests run: | docker run --rm -v $PWD:$PWD -w $PWD pyhf/pyhf-validation-root-base:$GITHUB_SHA -c "python tests/rf308_normintegration2d.py" From 2bebbf617bb27cd2787d50f2b58582b8dfa8559a Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Sun, 15 Mar 2020 18:42:56 -0500 Subject: [PATCH 2/6] Go back to ROOT build instead of root_base --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bd8e450..4c992cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN conda config --add channels conda-forge && \ conda config --set allow_softlinks false && \ conda config --set always_copy true RUN conda create --yes --quiet -p /opt/condaenv \ - "root_base=$ROOT_VERSION" \ + "root=$ROOT_VERSION" \ "python=$PYTHON_VERSION" # Forcibly remove some packages to make the final image smaller # c.f. https://github.com/conda-forge/root-feedstock/blob/master/recipe/meta.yaml From 97b22c0cc84042bd3f1ce3fd1babe3445f594259 Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Sun, 15 Mar 2020 18:43:45 -0500 Subject: [PATCH 3/6] Also check hist2workspace --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8bcae96..04c6544 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: docker images - name: Check PATH run: | - docker run --rm pyhf/pyhf-validation-root-base:$GITHUB_SHA -c "which python;python --version;which root;root-config --version" + docker run --rm pyhf/pyhf-validation-root-base:$GITHUB_SHA -c "which python;python --version;which root;root-config --version;hist2workspace --help" - name: Run tests run: | docker run --rm -v $PWD:$PWD -w $PWD pyhf/pyhf-validation-root-base:$GITHUB_SHA -c "python tests/rf308_normintegration2d.py" From febe0d54937e2ece4bc53863a7b04088198818fc Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Sun, 15 Mar 2020 20:34:18 -0500 Subject: [PATCH 4/6] Also check curl and tar --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 04c6544..a4c5798 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,6 +25,7 @@ jobs: - name: Check PATH run: | docker run --rm pyhf/pyhf-validation-root-base:$GITHUB_SHA -c "which python;python --version;which root;root-config --version;hist2workspace --help" + docker run --rm pyhf/pyhf-validation-root-base:$GITHUB_SHA -c "which curl;which tar" - name: Run tests run: | docker run --rm -v $PWD:$PWD -w $PWD pyhf/pyhf-validation-root-base:$GITHUB_SHA -c "python tests/rf308_normintegration2d.py" From 8a8b41fd0caaaae010a21e25f9d5b7df3d8fd38f Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Sun, 15 Mar 2020 20:38:26 -0500 Subject: [PATCH 5/6] try usng root-binaries --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4c992cf..f36eeaf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN conda config --add channels conda-forge && \ conda config --set allow_softlinks false && \ conda config --set always_copy true RUN conda create --yes --quiet -p /opt/condaenv \ - "root=$ROOT_VERSION" \ + "root-binaries=$ROOT_VERSION" \ "python=$PYTHON_VERSION" # Forcibly remove some packages to make the final image smaller # c.f. https://github.com/conda-forge/root-feedstock/blob/master/recipe/meta.yaml From cdb8f81ca4837be52060a754331e8545fbb93bbe Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Sun, 15 Mar 2020 21:33:47 -0500 Subject: [PATCH 6/6] Remove extra libraries --- Dockerfile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index f36eeaf..1398601 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,11 +18,13 @@ RUN conda create --yes --quiet -p /opt/condaenv \ # c.f. https://github.com/conda-forge/root-feedstock/blob/master/recipe/meta.yaml RUN eval "$(python -m conda shell.bash hook)" && \ conda activate /opt/condaenv && \ - conda install -y \ - libblas \ - libcblas \ - fftw \ - zlib + conda remove --yes --force-remove \ + pythia8 \ + qt \ + libllvm9 \ + libclang \ + pandoc \ + xrootd RUN rm -rf /opt/condaenv/tutorials /opt/condaenv/ui5 FROM base