Return sqlite3 and patchelf (#1206)

* patchelf bzip2 sqlite3

* update ubuntu 16.04

* merge 1604/basic.sh -> basic.sh

images/linux/scripts/installers/1604/basic.sh

@@ -1,85 +0,0 @@
-#!/bin/bash
-################################################################################
-##  File:  basic.sh
-##  Desc:  Installs basic command line utilities and dev packages
-################################################################################
-
-# Source the helpers for use with the script
-source $HELPER_SCRIPTS/document.sh
-source $HELPER_SCRIPTS/apt.sh
-
-set -e
-
-common_packages="dnsutils
-                 iproute2
-                 iputils-ping
-                 libc++-dev
-                 libc++abi-dev
-                 libcurl3
-                 libicu55
-                 libunwind8
-                 locales
-                 openssh-client
-                 tzdata
-                 zstd
-                 lib32z1
-                 libxkbfile-dev
-                 pkg-config
-                 libsecret-1-dev
-                 libxss1
-                 libgconf-2-4
-                 dbus
-                 xvfb
-                 libgbm-dev
-                 libgtk-3-0
-                 tk
-                 fakeroot
-                 dpkg
-                 rpm
-                 xz-utils
-                 xorriso
-                 zsync
-                 gnupg2
-                 texinfo"
-
-cmd_packages="curl
-              file
-              ftp
-              jq
-              netcat
-              ssh
-              parallel
-              rsync
-              shellcheck
-              sudo
-              telnet
-              time
-              unzip
-              zip
-              wget
-              upx
-              m4
-              bison
-              flex"
-
-# Install basic command-line utilities
-for package in $common_packages $cmd_packages; do
-    echo "Install $package"
-    apt-fast install -y --no-install-recommends $package
-done
-
-# Run tests to determine that the software installed as expected
-echo "Testing to make sure that script performed as expected, and basic scenarios work"
-for cmd in $cmd_packages; do
-    if ! command -v $cmd; then
-        echo "$cmd was not installed"
-        exit 1
-    fi
-done
-
-# Document what was added to the image
-echo "Lastly, documenting what we added to the metadata file"
-DocumentInstalledItem "Basic packages:"
-for package in $common_packages $cmd_packages; do
-    DocumentInstalledItemIndent $package
-done

images/linux/scripts/installers/basic.sh

@@ -38,7 +38,8 @@ common_packages="dnsutils
                  zsync
                  gnupg2
                  lib32z1
-                 texinfo"
+                 texinfo
+                 libsqlite3-dev"
 
 cmd_packages="curl
               file
@@ -57,7 +58,10 @@ cmd_packages="curl
               wget
               m4
               bison
-              flex"
+              flex
+              patchelf
+              bzip2
+              sqlite3"
 
 if isUbuntu20 ; then
     echo "Install python2"
@@ -65,7 +69,7 @@ if isUbuntu20 ; then
 fi
 
 echo "Install libcurl"
-if isUbuntu18 ; then
+if isUbuntu16 || isUbuntu18; then
    libcurelVer="libcurl3"
 fi
 
@@ -75,12 +79,19 @@ fi
 
 apt-get install -y --no-install-recommends $libcurelVer
 
+# install additional packages only for Ubuntu16.04
+if isUbuntu16; then
+    common_packages="$common_packages
+            libc++-dev
+            libc++abi-dev
+            libicu55"
+fi
+
 for package in $common_packages $cmd_packages; do
     echo "Install $package"
     apt-get install -y --no-install-recommends $package
 done
 
-
 # Run tests to determine that the software installed as expected
 echo "Testing to make sure that script performed as expected, and basic scenarios work"
 for cmd in $cmd_packages; do

images/linux/ubuntu1604.json

@@ -143,7 +143,7 @@
                 "{{template_dir}}/scripts/installers/azcopy.sh",
                 "{{template_dir}}/scripts/installers/azure-cli.sh",
                 "{{template_dir}}/scripts/installers/azure-devops-cli.sh",
-                "{{template_dir}}/scripts/installers/1604/basic.sh",
+                "{{template_dir}}/scripts/installers/basic.sh",
                 "{{template_dir}}/scripts/installers/aliyun-cli.sh",
                 "{{template_dir}}/scripts/installers/aws.sh",
                 "{{template_dir}}/scripts/installers/build-essential.sh",