Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Use root-binaries conda-forge package as build base #5

Merged
merged 6 commits into from
Mar 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
14 changes: 8 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down