From 05406d50a532e8557de8fb9b1b3579be1534d9a8 Mon Sep 17 00:00:00 2001
From: Peter Zahemszky <63169891+peterzahemszky@users.noreply.github.com>
Date: Thu, 18 Nov 2021 17:18:09 +0000
Subject: [PATCH 1/2] Discourage the use of Snap
---
README.rst | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.rst b/README.rst
index 0fba4366..5d27fa1a 100644
--- a/README.rst
+++ b/README.rst
@@ -53,6 +53,8 @@ If you would like to test a deployment of S-R using Docker for CI purposes, then
#. Make sure that you have a recent version of Docker. This guide has been tested on version 19.03.5 (build 633a0ea838).
:code:`make deps` will install the latest version if you do not already have a version of docker available.
Full instructions available at `the Docker website `_.
+ Docker installed using Ubuntu's Snap package manager might not work as expected; see
+ https://github.com/simphony/simphony-remote/issues/572 for details.
A Makefile rule is provided for convenience.
**NOTE: this overwrites the docker.list file you might have setup in your /etc/apt/sources.d/ directory**.
You might be prompted for the root password to execute this::
From a0940b4451599579bfa71ef55fa3e7b274ae30dc Mon Sep 17 00:00:00 2001
From: Peter Zahemszky <63169891+peterzahemszky@users.noreply.github.com>
Date: Fri, 19 Nov 2021 13:24:22 +0000
Subject: [PATCH 2/2] Update Docker installation URLs
---
README.rst | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.rst b/README.rst
index 5d27fa1a..a5e75853 100644
--- a/README.rst
+++ b/README.rst
@@ -52,7 +52,8 @@ If you would like to test a deployment of S-R using Docker for CI purposes, then
#. Make sure that you have a recent version of Docker. This guide has been tested on version 19.03.5 (build 633a0ea838).
:code:`make deps` will install the latest version if you do not already have a version of docker available.
- Full instructions available at `the Docker website `_.
+ Full instructions available at the Docker website `for Ubuntu `_
+ and `for CentOS `_ operating systems.
Docker installed using Ubuntu's Snap package manager might not work as expected; see
https://github.com/simphony/simphony-remote/issues/572 for details.
A Makefile rule is provided for convenience.