Merge pull request #28 from andy-symonds/master

Updating repo to work with Colima container runtime

Dockerfile-jenkins

@@ -1,7 +1,7 @@
 FROM jenkins/jenkins:2.347-jdk11
 
 USER jenkins
-RUN /usr/local/bin/install-plugins.sh blueocean:1.25.5 build-timestamp:1.0.3 timestamper:1.17 pollscm:1.3.1 github-api:1.303-400.v35c2d8258028
+RUN jenkins-plugin-cli --plugins blueocean:1.25.5 build-timestamp:1.0.3 timestamper:1.17 pollscm:1.3.1 github-api:1.303-400.v35c2d8258028
 
 USER root
 ENV FLUENTD_HOST "fluentd"
@@ -18,4 +18,4 @@ RUN apt update && \
 RUN pip3 install -r requirements.txt
 
 COPY jenkins/1-configureJenkins.groovy /usr/share/jenkins/ref/init.groovy.d/1-configureJenkins.groovy
-COPY jenkins/2-addAccessKeys.groovy /usr/share/jenkins/ref/init.groovy.d/2-addAccessKeys.groovy
+COPY jenkins/2-addAccessKeys.groovy /usr/share/jenkins/ref/init.groovy.d/2-addAccessKeys.groovy

instructions/1-SystemSetup.md

@@ -4,6 +4,7 @@
 
 * Setup a development environment for CD4ML including:
 * Fork Git Code Repository into Personal GitHub
+* Configuring container runtime
 * Configuring a python code development environment
 * Install Docker Desktop or [an alternative](https://www.rockyourcode.com/docker-desktop-alternatives-for-macos/)
 
@@ -28,7 +29,13 @@ git clone https://github.com/<Your User Name>/CD4ML-Scenarios
 ### Setting your Jenkins Administrator Password
 Create a file called `jenkins-admin-password.txt` in the `jenkins\` folder. On the first line of the file type in a secure password. Save and close the file
 
-### Docker Settings Adjustments
+### Container Runtimes
+We have provided three options for container runtimes:
+- Docker Desktop (Windows, macOS and Linux). Free personal licence, but commerical licence required on work computer from January 2022
+- Colima (macOS and Linux). Free
+- Rancher (Windows, macOS and Linux). Free
+
+#### Docker Desktop Settings Adjustments
 Open Docker Desktop by clicking on the docker icon in your Mac or Windows taskbar and selecting Dashboard. Click the gear and select "Resources" and then "Advanced". Increase the RAM allocated to docker to 4 Gigabytes. Click "Apply and Restart".
 
 ![DockerSettings](./images/DockerSettings.png)
@@ -37,6 +44,16 @@ If you are running the environment on a Windows 10 machine, make sure to switch
 You can do this by clicking on the Docker icon in your Windows taskbar.
 You also need to make sure that your PC can handle virtual environments. This can be switched on or off in your systems BIOS.
 
+#### Colima setup
+Follow the instructions for installing Colima and Docker’s CLI with Homebrew from: https://smallsharpsoftwaretools.com/tutorials/use-colima-to-run-docker-containers-on-macos/
+
+When using Colima, immediately before the docker-compose step below, which downloads and starts the development environment, please run
+
+```bash
+colima start --cpu 4 --memory 8
+```
+
+
 ## Select your development environment
 In the next section you can choose from one of two different application development 
 environments either using a local machine based development environment or a