Merge pull request #997 from ge-high-assurance/ji/use-current-vagrant

Use most current Ubuntu 22.04 vagrant box
ge-high-assurance · Aug 31, 2023 · 51e153a · 51e153a
2 parents 6060403 + af70ad5
commit 51e153a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/build-virtual-machine.yml b/.github/workflows/build-virtual-machine.yml
@@ -33,10 +33,10 @@ jobs:
 
     - name: Download base box for virtual machine
       run: |
-        curl -LOSfs https://app.vagrantup.com/ubuntu/boxes/jammy64/versions/20230720.0.0/providers/virtualbox.box
+        curl -LOSfs https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64-vagrant.box
         mkdir -p RACK/rack-box/jammy64
-        tar -xf virtualbox.box -C RACK/rack-box/jammy64
-        rm -f virtualbox.box
+        tar -xf jammy-server-cloudimg-amd64-vagrant.box -C RACK/rack-box/jammy64
+        rm -f jammy-server-cloudimg-amd64-vagrant.box
 
     - name: Build rack-box virtual machine
       run: |

diff --git a/rack-box/README.md b/rack-box/README.md
@@ -76,9 +76,10 @@ although we will mention each file here as well:
   --exclude=.github --exclude=assist --exclude=cli --exclude=rack-box
   --exclude=tests --exclude=tools RACK`)
 
-- `jammy64\*`: Download latest Ubuntu 22.04 vagrant box from
-  <https://app.vagrantup.com/ubuntu/boxes/jammy64>, unpacking it in a
-  `jammy64` folder (`tar -xf virtualbox.box -C RACK/rack-box/jammy64`)
+- `jammy64\*`: Download current Ubuntu 22.04 vagrant box from
+  <https://cloud-images.ubuntu.com/jammy/current>, unpacking it in a
+  `jammy64` folder (`tar -xf jammy-server-cloudimg-amd64-vagrant.box
+  -C RACK/rack-box/jammy64`)
 
 Once you have put these files into the `files` subdirectory, skip to
 [Build the rack-box images](#Build-the-rack-box-images) for the next

diff --git a/rack-box/scripts/clean.sh b/rack-box/scripts/clean.sh
@@ -26,7 +26,7 @@ fi
 
 # Upgrade all packages
 
-apt-get update -yqq
+apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update -yqq
 apt-get upgrade -yqq
 
 # Clean apt cache and temporary files

diff --git a/rack-box/scripts/install.sh b/rack-box/scripts/install.sh
@@ -10,7 +10,7 @@ cd /tmp/files
 
 export DEBIAN_FRONTEND=noninteractive
 export DEBCONF_NONINTERACTIVE_SEEN=true
-apt-get update -yqq
+apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update -yqq
 apt-get install -yqq ca-certificates software-properties-common
 cp GE_External_Root_CA_2_1.crt /usr/local/share/ca-certificates
 update-ca-certificates