Added note about VMWare in readme. Removed Kill command in docker b/c it throws an error if there are no running docker containers. This will be debugged and fixed next.

Author: Bryden Robertson

readme.md

@@ -11,7 +11,7 @@
 ## Creating a new challenge
 
 - Create a branch called "[difficulty][topic]#" where:
-    - difficulty is beginner, intermediate, advanced 
+    - difficulty is beginner, intermediate, advanced
     - Topic is linux, web, wireless, lockpicking, or any of the github labels. Make one if there isn't one!
     - and # is one above the highest challenge number in that category. Check for issues tagged `documentation` and `your topic` to find the challenge numbering list.
         - This number will determine the port number if dockerizing the challenge. 6000 + # = the exposed port
@@ -28,7 +28,7 @@
 
 ### Dockerfiles
 
-If your challenge is using docker, you will need a Dockerfile. It should contain most of what you need in the container for the challenge. Use challenge1's dockerfile as an example. 
+If your challenge is using docker, you will need a Dockerfile. It should contain most of what you need in the container for the challenge. Use challenge1's dockerfile as an example.
 
 The dockerfile will handle setup such as:
 
@@ -66,4 +66,8 @@ Because prod and dev are pulling from 2 different branches for deployment, varia
 
 The `src` field has the variable `{{repo_path}}` because depending on the machine it's being deployed to (prod vs dev) the path might be `/home/rundeck/FITS-CTF/` (for prod) or it might be `/home/rundeck/FITS-CTF-DEV/` (for dev).
 
-These variables are defined in `group_vars` and `vars` folders in the root of the project.
+These variables are defined in `group_vars` and `vars` folders in the root of the project.
+
+## Troubleshooting Notes
+
+* The VMWare instance at 192.168.1.16 is NOT accessible while on the FITS-lab wifi. To connect to it, use the normal FITS wifi

roles/common/tasks/docker.yml

@@ -11,23 +11,23 @@
     - software-properties-common
   tags:
     - docker
- 
+
 # curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
 - name: Add Dockers official GPG key
   apt_key:
     url: https://download.docker.com/linux/ubuntu/gpg
     state: present
   tags:
     - docker
- 
+
 # sudo apt-key fingerprint 0EBFCD88
 - name: Verify that we have the key with the fingerprint
   apt_key:
     id: 0EBFCD88
     state: present
   tags:
     - docker
- 
+
 # sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu xenial stable"
 - name: Set up the stable repository
   apt_repository:
@@ -36,14 +36,14 @@
     update_cache: yes
   tags:
     - docker
- 
+
 # sudo apt-get update
 - name: Update apt packages
   apt:
     update_cache: yes
   tags:
     - docker
- 
+
 # sudo apt-get install docker-ce
 - name: Install docker
   apt:
@@ -53,15 +53,15 @@
   notify: Start docker on boot
   tags:
     - docker
- 
+
 # sudo groupadd docker
 - name: Create "docker" group
   group:
     name: "docker"
     state: present
   tags:
     - docker
- 
+
 # sudo usermod -aG docker ubuntu
 - name: Add user to "docker" group
   user:
@@ -73,7 +73,7 @@
     - challenge
   tags:
     - docker
- 
+
 # sudo apt-get install docker-compose
 - name: Install docker-compose
   apt:
@@ -84,7 +84,7 @@
     - docker
 
 #stop all containers, that way when challenges are discontinued they stop running after the next deploy
-- name: Kill All Containers
-  ignore_errors: yes
-  shell: |
-    docker kill $(docker ps -q)
+# - name: Kill All Containers
+#   ignore_errors: yes
+#   shell: |
+#     docker kill $(docker ps -q)