De-dupe the Docker Hub instructions into pre-reqs

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>

Author: alexellis

lab1.md

@@ -64,6 +64,32 @@ $ faas-cli help
 $ faas-cli version
 ```
 
+## Configure a registry - The Docker Hub
+
+Sign up for a Docker Hub account. The [Docker Hub](https://hub.docker.com) allows you to publish your Docker images on the Internet for use on multi-node clusters or to share with the wider community. We will be using the Docker Hub to publish our functions during the workshop.
+
+You can sign up here: [Docker Hub](https://hub.docker.com)
+
+Open a Terminal or Git Bash window and log into the Docker Hub using the username you signed up for above.
+
+```
+$ docker login
+```
+
+> Note: Tip from community - if you get an error while trying to run this command on a Windows machine, then click on the Docker for Windows icon in the taskbar and log into Docker there instead "Sign in / Create Docker ID".
+
+* Set your OpenFaaS prefix for new images
+
+OpenFaaS images are stored in a Docker registry or the Docker Hub, we can set an environment variable so that your username is automatically added to new functions you create. This will save you some time over the course of the workshop.
+
+Edit `~/.bashrc` or `~/.bash_profile` - create the file if it doesn't exist.
+
+Now add the following - changing the URL as per the one you saw above.
+
+```
+export OPENFAAS_PREFIX="" # Populate with your Docker Hub username
+```
+
 ### Setup a single-node cluster
 
 If you're taking part in an instructor-lead event then the organiser may ask you to use Docker Swarm, because it's much quicker and easier to set up in a short period of time. For some workshops you will be using Kubernetes.

lab1a.md

@@ -14,22 +14,6 @@ $ docker swarm init
 
 > If you receive an error then pass the `--advertise-addr` parameter along with your laptop's IP address.
 
-### Docker Hub
-
-Sign up for a Docker Hub account. The [Docker Hub](https://hub.docker.com) allows you to publish your Docker images on the Internet for use on multi-node clusters or to share with the wider community. We will be using the Docker Hub to publish our functions during the workshop.
-
-You can sign up here: [Docker Hub](https://hub.docker.com)
-
-> Note: The Docker Hub can also be setup to automate builds of Docker images.
-
-Open a Terminal or Git Bash window and log into the Docker Hub using the username you signed up for above.
-
-```sh
-$ docker login
-```
-
-> Note: Tip from community - if you get an error while trying to run this command on a Windows machine, then click on the Docker for Windows icon in the taskbar and log into Docker there instead "Sign in / Create Docker ID".
-
 ### Deploy OpenFaaS
 
 The instructions for deploying OpenFaaS change from time to time as we strive to make this easier. The following will get OpenFaaS deployed in around 60 seconds:

lab1b.md

@@ -204,20 +204,6 @@ NAME                                   STATUS    ROLES     AGE       VERSION
 gke-name-default-pool-eceef152-qjmt   Ready     <none>    1h        v1.10.7-gke.2
 ```
 
-## Configure a registry - The Docker Hub
-
-Sign up for a Docker Hub account. The [Docker Hub](https://hub.docker.com) allows you to publish your Docker images on the Internet for use on multi-node clusters or to share with the wider community. We will be using the Docker Hub to publish our functions during the workshop.
-
-You can sign up here: [Docker Hub](https://hub.docker.com)
-
-Open a Terminal or Git Bash window and log into the Docker Hub using the username you signed up for above.
-
-```
-$ docker login
-```
-
-> Note: Tip from community - if you get an error while trying to run this command on a Windows machine, then click on the Docker for Windows icon in the taskbar and log into Docker there instead "Sign in / Create Docker ID".
-
 ## Deploy OpenFaaS
 
 The instructions for deploying OpenFaaS change from time to time as we strive to make this even easier.
@@ -308,7 +294,7 @@ Edit `~/.bashrc` or `~/.bash_profile` - create the file if it doesn't exist.
 Now add the following - changing the URL as per the one you saw above.
 
 ```
--export OPENFAAS_URL="" # populate as above
+export OPENFAAS_URL="" # populate as above
 ```
 
 Now move onto [Lab 2](lab2.md)