Update vqfx (light) image

CHANGELOG.md

@@ -11,6 +11,7 @@
 - Added a lesson on BASH [Commit #1fe7b94](https://github.com/nre-learning/nrelabs-curriculum/commit/1fe7b94454e880b1a468b1d1742d2911139359ab)
 - Remove platform images from curriculum [#245](https://github.com/nre-learning/nrelabs-curriculum/pull/245)
 - Modified images to support a standard build process [#247](https://github.com/nre-learning/nrelabs-curriculum/pull/247)
+- Update vqfx (light) image [#251](https://github.com/nre-learning/nrelabs-curriculum/pull/251)
 
 ## v0.3.2 - April 19, 2019
 

images/vqfx/Dockerfile

@@ -18,7 +18,7 @@ RUN apt-get update -qy \
     procps \
  && rm -rf /var/lib/apt/lists/*
 
-COPY vqfx-orig.qcow2 /vqfx.qcow2
+COPY jinstall-vqfx-10-f-18.4R1.8.qcow2 /vqfx.qcow2
 COPY launch.sh /
 
 EXPOSE 22 161/udp 830 5000 10000-10099

images/vqfx/Makefile

@@ -0,0 +1,27 @@
+# SHELL=/bin/bash
+
+TARGET_VERSION ?= latest
+
+all: docker
+
+docker:
+
+	# ./download_packages.sh
+
+	docker build -t antidotelabs/vqfx:$(TARGET_VERSION) .
+	# docker push antidotelabs/vqfx:$(TARGET_VERSION)
+
+	# The below might be useful for building an image with snapshots.
+	# Currently leaving this commented out so that we can finish the rest of the pipeline without this added
+	# complexity, not to mention that some infrastructure improvements (both prod and selfmedicate) might mean
+	# we don't need to do the snapshot trick. However, if it proves necessary in the future, this does work,
+	# we just need to add the logic to copy the resulting disk file out and into its own container, so we don't
+	# create a monster image.
+	#
+	docker kill vqfx || true
+	docker rm vqfx || true
+	sleep 5
+	docker run -d --name vqfx -v $$(pwd):/cap --rm -p 2222:22 --privileged antidotelabs/vqfx:$(TARGET_VERSION)
+	# ./wait_for_live.sh
+	# docker exec vqfx /create_snapshot.expect
+

images/vqfx/download_packages.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# This script uses the gsutil utility from Google Cloud
+# to download files from the relevant bucket. See
+# https://cloud.google.com/sdk/docs/ for instructions on installing
+# the Google Cloud SDK, which includes this utility.
+
+declare -a arr=(
+    "container-vqfx/jinstall-vqfx-10-f-18.4R1.8.qcow2"
+)
+
+for i in "${arr[@]}"
+do
+   gsutil cp "gs://nrelabs-curriculum-base-images/$i" "./$i"
+   mv "$i" ./
+done
+
+rm -rf container-vqfx/