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.

Sign up for GitHub

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

Jump to bottom

Refactor Dockerfiles to use common base layer #92

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Refactor Dockerfiles to use common base layer #92

wants to merge 2 commits into from

Commits on Jun 10, 2017

  1. Refactor Dockerfiles to use common base layer 

    - Dockerfile.base contains all the Bifrost dependencies.
- Dockerfile inherits Dockerfile.base and contains the Bifrost build.
- The old Dockerfile.cpu and Dockerfile.gpu are removed.
- The FROM line and build args in the Dockerfiles are parameterised
  using ARGs, which are inserted by the Makefile (a WAR is currently
  needed for the FROM line because it doesn't support ARG, but this was
  recently fixed in upstream Docker so we can eventually do it
  properly).
- The Makefile defines 4 targets: docker-base (GPU container with
  dependencies only), docker (GPU container with Bifrost installed),
  docker-base-cpu (CPU container with dependencies only), and docker-cpu
  (CPU container with Bifrost installed).
- We can now also build containers with different OS images by
  specifying CUDA_IMAGE_NAME or CPU_IMAGE_NAME. E.g.,
  "make docker
   CUDA_IMAGE_NAME=nvidia/cuda:7.5
   IMAGE_NAME=ledatelescope/bifrost-cuda-7.5", which allows us to easily
   test compatibility with older versions of CUDA.
    @benbarsdell
    benbarsdell committed Jun 10, 2017
    Configuration menu
    Copy the full SHA
    37b2f00 View commit details
    Browse the repository at this point in the history

  2. Fix travis build by setting docker tag :latest-cpu

    @benbarsdell
    benbarsdell committed Jun 10, 2017
    Configuration menu
    Copy the full SHA
    8b5bf91 View commit details
    Browse the repository at this point in the history