From d97c448c9a4fb6b74bf7e1e460990a92c5965064 Mon Sep 17 00:00:00 2001 From: Justin Littman Date: Wed, 5 Apr 2017 11:50:26 -0400 Subject: [PATCH] Added install docs to bumpversion. --- .bumpversion.cfg | 2 ++ docs/install.rst | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index ee76de59..440b1799 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -7,3 +7,5 @@ current_version = 1.7.0 [bumpversion:file:requirements/release.txt] +[bumpversion:file:docs/install.rst] + diff --git a/docs/install.rst b/docs/install.rst index 9130db8f..2bdc8cf3 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -33,15 +33,15 @@ Installing locally requires Docker and Docker-Compose. See :ref:`docker-installi git clone https://github.com/gwu-libraries/sfm-docker.git cd sfm-docker - # Replace 1.6.0 with the correct version. - git checkout 1.6.0 + # Replace 1.7.0 with the correct version. + git checkout 1.7.0 cp example.prod.docker-compose.yml docker-compose.yml cp example.env .env -or just download ``example.prod.docker-compose.yml`` and ``example.env`` (replacing 1.6.0 with the correct version):: +or just download ``example.prod.docker-compose.yml`` and ``example.env`` (replacing 1.7.0 with the correct version):: - curl -L https://github.com/gwu-libraries/sfm-docker/raw/1.6.0/example.prod.docker-compose.yml > docker-compose.yml - curl -L https://github.com/gwu-libraries/sfm-docker/raw/1.6.0/example.env > .env + curl -L https://github.com/gwu-libraries/sfm-docker/raw/1.7.0/example.prod.docker-compose.yml > docker-compose.yml + curl -L https://github.com/gwu-libraries/sfm-docker/raw/1.7.0/example.env > .env 2. Update configuration in ``.env`` as described in :ref:`install-configuration`. @@ -68,7 +68,7 @@ Notes: To launch an Amazon EC2 instance running SFM, follow the normal procedure for launching an instance. In *Step 3: Configure Instance Details*, under *Advanced Details* paste the following in user details and modify as appropriate as described in :ref:`install-configuration`. Also, in the curl -statements change *master* to the correct version, e.g., *1.6.0*:: +statements change *master* to the correct version, e.g., *1.7.0*:: #cloud-config repo_update: true @@ -223,13 +223,13 @@ This may take several minutes. 3. Get the latest ``example.prod.docker-compose.yml``. If you previously cloned the sfm-docker repository then:: git pull - # Replace 1.6.0 with the correct version. - git checkout 1.6.0 + # Replace 1.7.0 with the correct version. + git checkout 1.7.0 cp example.prod.docker-compose.yml docker-compose.yml -otherwise, replacing 1.6.0 with the correct version:: +otherwise, replacing 1.7.0 with the correct version:: - curl -L https://github.com/gwu-libraries/sfm-docker/1.6.0/master/example.prod.docker-compose.yml > docker-compose.yml + curl -L https://github.com/gwu-libraries/sfm-docker/1.7.0/master/example.prod.docker-compose.yml > docker-compose.yml 4. If you customized your previous ``docker-compose.yml`` file (e.g., for SFM ELK containers), make the same changes in your new ``docker-compose.yml``.