From 79a02022476cd38be4b52c1b4f05a761dc391d5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Kvarnstr=C3=B6m?= <jonas.kvarnstrom@liu.se>
Date: Sun, 11 Apr 2021 10:43:05 +0200
Subject: [PATCH] Instruction updates, docker login

---
 README.md           | 18 ++++++------------
 doc/docker_login.md | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 doc/docker_login.md

diff --git a/README.md b/README.md
index cd340f5..16b49b8 100644
--- a/README.md
+++ b/README.md
@@ -1,26 +1,20 @@
 # Developer Environments
 
-A number of development environments have been set up, adapted to different tasks.  
+A number of development environments have been set up, adapted to different tasks.  The development environments provide many additional functionalities related to the core system, including those functionalities that are present in the tutorials.
 
 Please note that the instructions for the development environments are written for developers.  They do not necessarily explain every step in detail and have not necessarily been tested on every combination of hardware, operating system, software setup and so on.  You are welcome to contact us for assistance in troubleshooting problems that may arise. 
 
 To install a development environment, follow these steps:
 
-- [Ensure that you have a supported operating system](doc/install_os.md) (directly on your hardware or in a virtual machine)
- 
-The development environment then provides many additional functionalities 
-related to the core system, including those functionalities that are present 
-in the tutorials.
+- [Ensure that you have a supported operating system](doc/install_os.md), directly on your hardware or in a virtual machine
 
-## Development Environments
+- [Install local software on your development system](doc/install_playbooks.md) using Ansible Playbooks
+
+- [Log in to the Docker Registry](doc/docker_login.md) using a Deploy Key or Gitlab user/keyword
 
-When you have installed 
 
-software according to the instructions above,
-you can follow the following instructions to set up and test basic 
-functionality.
 
-- [Log in to Docker Registry](https://gitlab.liu.se/lrs/devenv_docker_images) -- Just follow the instructions to log in using a Gitlab user/password or deploy key.  Do *not* download any images using `docker pull`.  If you can't access this page, ++++++++ what to do?  Ask us for access?
+## Development Environments
 
 - [Prepare Existing ROS Computer](doc/prepare_ros_computer.md)
 
diff --git a/doc/docker_login.md b/doc/docker_login.md
new file mode 100644
index 0000000..339ce0c
--- /dev/null
+++ b/doc/docker_login.md
@@ -0,0 +1,19 @@
+# Logging In to the Docker Registry
+
+A large part of the software for the development environments is made available in Docker images.  To access these images you need to log in to our Docker Registry using one of the following methods.
+
+- If you have received a Deploy Key from us, use this to log in according to the instructions we specified at that point.
+
+- If you have been given direct access to the `devenv_docker_images` project at `gitlab.liu.se`:
+
+  - Find the Deploy Key at [devenv_docker_images](https://gitlab.liu.se/lrs/devenv_docker_images/-/blob/master/README.md), or
+
+  - Log in using your username and password from `gitlab.liu.se`:  
+
+    ```bash
+    docker login gitlab.liu.se:5000
+    ```
+
+    We are not sure if this option this works for external users. Please test if you are an external user and report back!
+
+If you cannot use either of these methods, please contact us to be given access to the software.
-- 
GitLab