diff options
| author | Omar Padron <omar.padron@kitware.com> | 2018-10-26 13:15:05 -0400 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2018-10-26 10:15:05 -0700 |
| commit | aa1c814c7592c9e71f564181af3a8f2a115bd304 (patch) | |
| tree | 7071718f8c473e9393c28211ca5d17634e6c43aa /lib | |
| parent | 734d903b0313e70f5d22959fdc34432643120d46 (diff) | |
| download | spack-aa1c814c7592c9e71f564181af3a8f2a115bd304.tar.gz spack-aa1c814c7592c9e71f564181af3a8f2a115bd304.tar.bz2 spack-aa1c814c7592c9e71f564181af3a8f2a115bd304.tar.xz spack-aa1c814c7592c9e71f564181af3a8f2a115bd304.zip | |
docker: unite Dockerfiles; auto-deploy images to DockerHub (#9329)
* Unite Dockerfiles - add build/run/push scripts
* update docker documentation
* update .travis.yml
* switch to using a preprocessor on Dockerfiles
* skip building docker images on pull requests
* update files with copyright info
* tweak when travis builds for docker files are done
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/docs/docker_for_developers.rst | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/lib/spack/docs/docker_for_developers.rst b/lib/spack/docs/docker_for_developers.rst index 70d5183011..2f1b5a949a 100644 --- a/lib/spack/docs/docker_for_developers.rst +++ b/lib/spack/docs/docker_for_developers.rst @@ -17,13 +17,13 @@ meant to serve as the companion documentation for the :ref:`packaging-guide`. Overview -------- -To get started, all you need is the latest version of ``docker`` and -``docker-compose``. +To get started, all you need is the latest version of ``docker``. .. code-block:: console $ cd share/spack/docker - $ docker-compose run --rm ubuntu + $ source config/ubuntu.bash + $ ./run-image.sh This command should drop you into an interactive shell where you can run spack within an isolated docker container running ubuntu. The copy of spack being @@ -32,13 +32,10 @@ you make should be immediately reflected in the running docker container. Feel free to add or modify any packages or to hack on spack, itself. Your contained copy of spack should immediately reflect all changes. -To work within a container running a different linux distro, change the "ubuntu" -argument to any one of the services listed under the ``docker-compose.yml`` -file. +To work within a container running a different linux distro, source one of the +other environment files under ``config``. .. code-block:: console - $ docker-compose config --services - fedora - ubuntu - $ docker-compose run --rm fedora + $ source config/fedora.bash + $ ./run-image.sh |