Merge pull request #22 from obsrvbl-oss/update_public_repository

Update to 5.1.1b

Author: dkowalcz-sec

images/docker/Dockerfile

@@ -4,7 +4,7 @@ LABEL maintainer="Observable Networks <support@obsrvbl.com>"
 # Install dependencies.
 RUN apt-get update && apt-get install -y curl
 
-RUN curl -L -O https://github.com/bbayles/netsa-pkg/releases/download/v0.1.15/netsa-pkg.deb
+RUN curl -L -O https://github.com/mjschultz/netsa-pkg/releases/download/v0.1.27/netsa-pkg.deb
 RUN curl -L -O https://s3.amazonaws.com/onstatic/ona/master/ona-service_UbuntuXenialContainer_amd64.deb
 RUN apt install -y --fix-missing ./netsa-pkg.deb ./ona-service_UbuntuXenialContainer_amd64.deb
 

images/iso/build_iso_helper

@@ -15,25 +15,32 @@ $ ./build_iso_helper 20.04.1 legacy
 $ ./build_iso_helper --unittests
 $ ./build_iso_helper --doctests
 
-Real results as of December 2020:
+Real results as of February 2022:
+
+>>> get_iso_url('20.04.3', subiquity=True)
+'https://releases.ubuntu.com/20.04/ubuntu-20.04.3-live-server-amd64.iso'
+
+>>> get_iso_url('20.04.3', subiquity=False)
+Traceback (most recent call last):
+ValueError: no release found
 
 >>> get_iso_url('20.04.1', subiquity=True)
-'https://releases.ubuntu.com/20.04/ubuntu-20.04.1-live-server-amd64.iso'
+'https://old-releases.ubuntu.com/releases/20.04.1/ubuntu-20.04.1-live-server-amd64.iso'
 
 >>> get_iso_url('20.04.1', subiquity=False)
-'https://cdimage.ubuntu.com/ubuntu-legacy-server/releases/20.04.1/release/ubuntu-20.04.1-legacy-server-amd64.iso'
+'https://cdimage.ubuntu.com/ubuntu-legacy-server/releases/20.04/release/ubuntu-20.04.1-legacy-server-amd64.iso'
 
 >>> get_iso_url('20.04.0', subiquity=True)
 'https://old-releases.ubuntu.com/releases/20.04.0/ubuntu-20.04-live-server-amd64.iso'
 
 >>> get_iso_url('16.04.7', subiquity=False)
 'https://releases.ubuntu.com/16.04/ubuntu-16.04.7-server-amd64.iso'
 
->>> get_iso_url('18.04.5', subiquity=True)
-'https://releases.ubuntu.com/18.04/ubuntu-18.04.5-live-server-amd64.iso'
+>>> get_iso_url('18.04.6', subiquity=True)
+'https://releases.ubuntu.com/18.04/ubuntu-18.04.6-live-server-amd64.iso'
 
->>> get_iso_url('18.04.5', subiquity=False)
-'https://cdimage.ubuntu.com/ubuntu/releases/18.04.5/release/ubuntu-18.04.5-server-amd64.iso'
+>>> get_iso_url('18.04.6', subiquity=False)
+'https://cdimage.ubuntu.com/ubuntu/releases/18.04.6/release/ubuntu-18.04.6-server-amd64.iso'
 
 >>> get_iso_url('18.04.4', subiquity=False)
 'https://old-releases.ubuntu.com/releases/18.04.4/ubuntu-18.04.4-server-amd64.iso'
@@ -115,7 +122,7 @@ def get_iso_url(version, subiquity: bool, arch='amd64'):
         else:
             urlpath = (
                 'https://cdimage.ubuntu.com/ubuntu-legacy-server/releases'
-                f'/{v.long}/release/'
+                f'/{v.short}/release/'
             )
             isofile = f'ubuntu-{v.long_if_patch}-legacy-server-{arch}.iso'
     elif v.major >= 18: