Merge remote-tracking branch 'ibex/main'

Echtzeitsysteme · Jan 3, 2024 · d530b3a · d530b3a
2 parents 4b90b0f + cd987f4
commit d530b3a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ This repository is used to automatically build a [GIPS](https://github.com/Echtz
 
 ## Packages/Configuration
 
-- [Ubuntu 20.04](https://app.vagrantup.com/gusztavvargadr/boxes/ubuntu-desktop)
+- [Ubuntu 22.04](https://app.vagrantup.com/gusztavvargadr/boxes/xubuntu-desktop-2204-lts)
 - [OpenJDK 17](https://openjdk.org/projects/jdk/17/)
 - [Graphviz](https://graphviz.org/)
 - [GIPS Eclipse build](https://github.com/Echtzeitsysteme/gips-eclipse-build) (variant: *eclipse-gips-linux-user*)

diff --git a/Vagrantfile b/Vagrantfile
@@ -1,7 +1,7 @@
 token = ENV["GITHUB_TOKEN"]
 
 Vagrant.configure("2") do |config|
-    config.vm.box = "gusztavvargadr/ubuntu-desktop-2004-lts-xfce"
+    config.vm.box = "gusztavvargadr/xubuntu-desktop-2204-lts"
     config.vm.define 'gips'
     config.vm.provider :virtualbox do |vb|
         vb.name = "gips"

diff --git a/prov.sh b/prov.sh
@@ -124,7 +124,6 @@ sudo cp /usr/lib/x86_64-linux-gnu/jni/libglpk_java.* /usr/lib
 
 log "Clean-up"
 sudo apt-get remove -yq \
-        snapd \
         libreoffice-* \
         thunderbird \
         pidgin \