summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChandan Singh <csingh43@bloomberg.net>2018-10-05 22:25:48 -0400
committerChandan Singh <csingh43@bloomberg.net>2018-10-05 22:46:18 -0400
commite0bfdc9b19d1bafff80416f060c789148435a697 (patch)
treecb8ff6e30547bd9090ddf62744d62a10205495ad
parentb417dfba05b66cbee6445d3e7f61a90052f006d1 (diff)
downloadbuildstream-chandan/bst-and-docker.tar.gz
NEWS: Add entry about contrib/bst-docker-importchandan/bst-and-docker
As suggested in https://gitlab.com/BuildStream/buildstream/merge_requests/857#note_106809743, add a NEWS entry for `contrib/bst-docker-import` that was added recently.
-rw-r--r--NEWS3
-rw-r--r--doc/source/additional_docker.rst2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index bc35ff79a..acbdf2aa3 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,9 @@ buildstream 1.3.1
o Add new `pip` source plugin for downloading python packages using pip,
based on requirements files from previous sources.
+ o Generate Docker images from built artifacts using
+ `contrib/bst-docker-import` script.
+
=================
buildstream 1.1.5
diff --git a/doc/source/additional_docker.rst b/doc/source/additional_docker.rst
index 6193cc44e..be5852eeb 100644
--- a/doc/source/additional_docker.rst
+++ b/doc/source/additional_docker.rst
@@ -11,7 +11,7 @@ which these integrations work.
Run BuildStream inside Docker
-----------------------------
-Refer to the :ref:`BuildStream inside Docker <_docker>` documentaion for
+Refer to the :ref:`BuildStream inside Docker <docker>` documentaion for
instructions on how to run BuildStream as a Docker container.
Generate Docker images