ND064 Course 4 upgrades and fixes

lesson-1-introduction-to-microservices-security/exercises/starter/Vagrantfile

@@ -1,18 +1,19 @@
 # set up the default terminal
 ENV["TERM"]="linux"
 
+# set minimum version for Vagrant
+Vagrant.require_version ">= 2.2.10"
 Vagrant.configure("2") do |config|
-
-  # Use any version shown here https://app.vagrantup.com/opensuse/boxes/Leap-15.4.x86_64
-  config.vm.box = "opensuse/Leap-15.4.x86_64"
-  config.vm.box_version = "15.4.13.7"
+  config.vm.box = "opensuse/Leap-15.6.x86_64"
+  config.vm.box_version = "15.6.13.356"
+  config.vm.boot_timeout = 900
 
   # st the static IP for the vagrant box
   config.vm.network "private_network", ip: "192.168.50.4"
 
   # consifure the parameters for VirtualBox provider
   config.vm.provider "virtualbox" do |vb|
-    vb.memory = "2048"
+    vb.memory = "4096"
     vb.cpus = 4
     vb.customize ["modifyvm", :id, "--ioapic", "on"]
   end

lesson-3-docker-attack-surface-analysis-and-hardening/exercises/starter/Dockerfile

@@ -1,17 +1,14 @@
-# syntax=docker/dockerfile:1.0-experimental
-
-#define base image; replace with your image location once hardened
-FROM opensuse/leap:latest
+FROM opensuse/leap:15.6
 
 #define maintainer 
 LABEL maintainer="nick.reva@snap.com"
 
 #define version
 LABEL version="V1"
 
-# create a directory to work in
-RUN mkdir udacity \
-    && cd udacity
+# set working directory
+RUN mkdir -p /udacity
+WORKDIR /udacity
 
 #install zypper 
 RUN zypper refs && zypper refresh

lesson-3-docker-attack-surface-analysis-and-hardening/exercises/starter/Vagrantfile

@@ -1,18 +1,18 @@
 # set up the default terminal
 ENV["TERM"]="linux"
 
+Vagrant.require_version ">= 2.2.10"
 Vagrant.configure("2") do |config|
-
-  # Use any version shown here https://app.vagrantup.com/opensuse/boxes/Leap-15.4.x86_64
-  config.vm.box = "opensuse/Leap-15.4.x86_64"
-  config.vm.box_version = "15.4.13.7"
+  config.vm.box = "opensuse/Leap-15.6.x86_64"
+  config.vm.box_version = "15.6.13.356"
+  config.vm.boot_timeout = 900
 
   # st the static IP for the vagrant box
   config.vm.network "private_network", ip: "192.168.50.4"
 
   # consifure the parameters for VirtualBox provider
   config.vm.provider "virtualbox" do |vb|
-    vb.memory = "2048"
+    vb.memory = "4096"
     vb.cpus = 4
     vb.customize ["modifyvm", :id, "--ioapic", "on"]
   end

lesson-4-kubernetes-attack-surface-and-hardening/exercises/starter/Vagrantfile

@@ -16,20 +16,21 @@ Vagrant.configure("2") do |config|
       # set base image for the vagrant box
       # config.vm.box = "opensuse/Leap-15.2.x86_64"
       # Use any version shown here https://app.vagrantup.com/opensuse/boxes/Leap-15.4.x86_64
-      node.vm.box = "opensuse/Leap-15.4.x86_64"
-      node.vm.box_version = "15.4.13.7"
+      node.vm.box = "opensuse/Leap-15.6.x86_64"
+      node.vm.box_version = "15.6.13.356"
+      node.vm.boot_timeout = 900
       node.vm.hostname = "node#{i}"
 
       # set the static IP for the vagrant box
       node.vm.network "private_network", ip: "192.168.50.10#{i}"
       # configure the parameters for VirtualBox provider
       node.vm.provider "virtualbox" do |v|
         v.name = "node#{i}"
-        v.memory = 2048
-        v.cpus = 2
+        v.memory = 4096
+        v.cpus = 3
       end
     # Bootstrap the machine
-    config.vm.provision "shell", path: "bootstrap.sh"
+    # config.vm.provision "shell", path: "bootstrap.sh"
     end
   end
 end

lesson-4-kubernetes-attack-surface-and-hardening/exercises/starter/config-node1.yml

@@ -0,0 +1,3 @@
+node-name: node1
+node-ip: 192.168.50.101
+advertise-address: 192.168.50.101

lesson-4-kubernetes-attack-surface-and-hardening/exercises/starter/config-node2.yml

@@ -0,0 +1,4 @@
+token: SERVER_NODE_TOKEN
+server: https://192.168.50.101:9345
+node-name: node2
+node-ip: 192.168.50.102

lesson-5-software-composition-analysis/exercises/starter/Dockerfile

@@ -1,7 +1,7 @@
 #syntax=docker/dockerfile:1.0-experimental
 
 #define base image; replace with your image location once hardened
-FROM opensuse/leap:latest
+FROM opensuse/leap:15.6
 
 #define maintainer 
 LABEL maintainer="nick.reva@snap.com"
@@ -10,7 +10,7 @@ LABEL maintainer="nick.reva@snap.com"
 LABEL version="V1"
 
 #refresh zypper and install updates
-RUN zypper ref && zypper up -y
+RUN zypper ref
 
 #add local user
 USER $SEC_USER

lesson-5-software-composition-analysis/exercises/starter/vuln_app/requirements.txt

@@ -12,7 +12,7 @@ jinja2==2.11.3            # via aiohttp-jinja2
 markupsafe==1.1.0         # via jinja2
 multidict==4.5.2          # via aiohttp, yarl
 psycopg2==2.7.6.1         # via aiopg
-pyyaml==5.4.1
+pyyaml>=6.0
 trafaret-config==2.0.2
 trafaret==1.2.0
 yarl==1.3.0               # via aiohttp