From 75fb0d608788691713ddeb50a9a00b7815df5f1e Mon Sep 17 00:00:00 2001 From: asthLucas Date: Fri, 2 Oct 2020 11:24:36 -0300 Subject: [PATCH 1/3] Update docs/source/packs.rst Fix sphinx-autobuild host argument Set the Ubuntu base image to a version where Python 3.6 is the default --- Dockerfile | 4 ++-- Makefile | 2 +- docs/source/packs.rst | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3976775d5..d3987de8b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM ubuntu +FROM ubuntu:bionic RUN apt-get -qq update && apt-get -q install -y \ git \ - python-dev python-pip python-virtualenv \ + python3-dev python3-pip python-virtualenv \ libffi-dev libssl-dev ADD . /st2docs diff --git a/Makefile b/Makefile index b065a3ac6..8fc557c98 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,7 @@ livedocs: docs .livedocs @echo " RUNNING DOCS" @echo "===========================================================" @echo - . $(VIRTUALENV_DIR)/bin/activate; sphinx-autobuild -t $(COMMUNITY_TAG) -H 0.0.0.0 -b html $(DOC_SOURCE_DIR) $(DOC_BUILD_DIR)/html + . $(VIRTUALENV_DIR)/bin/activate; sphinx-autobuild -t $(COMMUNITY_TAG) --host 0.0.0.0 -b html $(DOC_SOURCE_DIR) $(DOC_BUILD_DIR)/html @echo .PHONY: ewcdocs diff --git a/docs/source/packs.rst b/docs/source/packs.rst index d1e0c3446..461a26c09 100644 --- a/docs/source/packs.rst +++ b/docs/source/packs.rst @@ -133,6 +133,10 @@ version or **upgrade to latest** if the version is not specified. Your config fi overwritten, so you can revert to an older version just as easily, but for production deployments we recommend to always specify versions in case there are major changes in ``latest``. +.. note:: + + It is also possible to download and install packs from GitLab using a SSH based URL through the web interface in the Actions section. + Pack Dependencies ~~~~~~~~~~~~~~~~~ From 71c1fcc38c8d3305ed1a807d8a8dbca64c393511 Mon Sep 17 00:00:00 2001 From: Amanda McGuinness Date: Fri, 26 Feb 2021 10:13:11 +0000 Subject: [PATCH 2/3] Update packs.rst Minor rewording to highlight GitLab URL support added in 3.4. --- docs/source/packs.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/packs.rst b/docs/source/packs.rst index 72594ba70..dd42b819d 100644 --- a/docs/source/packs.rst +++ b/docs/source/packs.rst @@ -135,7 +135,7 @@ we recommend to always specify versions in case there are major changes in ``lat .. note:: - It is also possible to download and install packs from GitLab using a SSH based URL through the web interface in the Actions section. + New feature! As of StackStorm 3.4. It is also possible to download and install packs from GitLab using a SSH based URL through the web interface in the Actions section. Pack Dependencies ~~~~~~~~~~~~~~~~~ From 11317d8e7cf5abd7ae343e4de2825e57aa9a551c Mon Sep 17 00:00:00 2001 From: Amanda McGuinness Date: Fri, 26 Feb 2021 16:12:05 +0000 Subject: [PATCH 3/3] Update packs.rst --- docs/source/packs.rst | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/source/packs.rst b/docs/source/packs.rst index dd42b819d..82fde5242 100644 --- a/docs/source/packs.rst +++ b/docs/source/packs.rst @@ -99,8 +99,14 @@ Exchange, and you can install your own packs from git just as easily. .. code-block:: bash - # Install your own pack from git + # Install your own pack from git using http(s) st2 pack install https://github.com/emedvedev/chatops_tutorial + + # Install your own pack from git using ssh + st2 pack install git@github.com/emedvedev/chatops_tutorial + + # Install your own pack using gitlab URL (added in release 3.4) + st2 pack install gitlab@gitlab.com:example/examplepack By default, the latest release of the pack will be installed, but you can specify a particular version, branch, tag, or even a commit hash. Just use `=`: @@ -133,9 +139,6 @@ version or **upgrade to latest** if the version is not specified. Your config fi overwritten, so you can revert to an older version just as easily, but for production deployments we recommend to always specify versions in case there are major changes in ``latest``. -.. note:: - - New feature! As of StackStorm 3.4. It is also possible to download and install packs from GitLab using a SSH based URL through the web interface in the Actions section. Pack Dependencies ~~~~~~~~~~~~~~~~~