diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bae6efe..a4c5798 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,6 +22,10 @@ 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;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" diff --git a/Dockerfile b/Dockerfile index bd8e450..1398601 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,17 +12,19 @@ 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-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 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