Skip to content

Commit

Permalink
Merge pull request #80 from carlwilson/maint/os-upgrade
Browse files Browse the repository at this point in the history
MAINT: Upgrade OS to Debian 12 Bookworm
  • Loading branch information
carlwilson authored May 30, 2024
2 parents e8cc39f + d2d4230 commit 247177e
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 29 deletions.
4 changes: 2 additions & 2 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Vagrant.configure("2") do |config|

# Every Vagrant development environment requires a box. You can search for
# boxes at https://vagrantcloud.com/search.
config.vm.box = "debian/bullseye64"
config.vm.box = "debian/bookworm64"

# Share an additional folder to the guest VM. The first argument is
# the path on the host to the actual folder. The second argument is
Expand All @@ -25,7 +25,7 @@ Vagrant.configure("2") do |config|
# provider for Vagrant. These expose provider-specific options.
config.vm.provider "virtualbox" do |vb|
# Name the prototype machine
vb.name = "VIPER v1.1"
vb.name = "VIPER v1.2"
# Display the VirtualBox GUI when booting the machine
vb.gui = true
# Customize the CPUs (2x) and memory (4GB) on the VM:
Expand Down
10 changes: 5 additions & 5 deletions ansible/roles/viper.setup/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
viper_env_apt_defaults:
# Source control a
- "git"
# Debian Stretch lacks the ability to download apt over HTTPS
# Debian lacks the ability to download apt over HTTPS
- "apt-transport-https"
# Install some helper network tools
- "psmisc"
Expand All @@ -14,10 +14,10 @@ viper_env_apt_defaults:
# Tools for keyboard and console setup
- keyboard-configuration
- console-setup
# Open JDK 11 for Java
- openjdk-11-jre
- openjdk-11-doc
- openjdk-11-source
# Open JDK 17 for Java
- openjdk-17-jre
- openjdk-17-doc
- openjdk-17-source
# GNOME desktop and Nemo add on for icon display
- task-gnome-desktop
- nemo
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/viper.setup/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ galaxy_info:
platforms:
- name: Debian
versions:
- stretch
- bookworm
galaxy_tags:
- OPF
- DDHN
Expand Down
24 changes: 12 additions & 12 deletions ansible/roles/viper.tools/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,18 +126,18 @@ viper:
lib: "{{ viper_lib }}/veraPDF/{{ verapdf_version }}"
src: "{{ viper_src }}/veraPDF/{{ verapdf_version }}"
mediaarea:
- name: "libzen0v5"
download_url: "https://mediaarea.net/download/binary/libzen0/0.4.41/libzen0v5_0.4.41-1_amd64.Debian_11.deb"
package_name: "libzen0v5_0.4.41-1_amd64.Debian_11.deb"
- name: "libmediainfo0v5"
download_url: "https://mediaarea.net/download/binary/libmediainfo0/23.04/libmediainfo0v5_23.04-1_amd64.Debian_11.deb"
package_name: "libmediainfo0v5_23.04-1_amd64.Debian_11.deb"
- name: "libzen0"
download_url: "https://mediaarea.net/download/binary/libzen0/0.4.41/libzen0v5_0.4.41-1_amd64.Debian_12.deb"
package_name: "libzen0v5_0.4.41-1_amd64.Debian_12.deb"
- name: "libmediainfo0"
download_url: "https://mediaarea.net/download/binary/libmediainfo0/24.04/libmediainfo0v5_24.04-1_amd64.Debian_12.deb"
package_name: "libmediainfo0v5_24.04-1_amd64.Debian_12.deb"
- name: "libmediaconch0"
download_url: "https://mediaarea.net/download/binary/libmediaconch0/23.03/libmediaconch0_23.03-1_amd64.Debian_11.deb"
package_name: "libmediaconch0_23.03-1_amd64.Debian_11.deb"
download_url: "https://mediaarea.net/download/binary/libmediaconch0/23.10/libmediaconch0_23.10-1_amd64.Debian_12.deb"
package_name: "libmediaconch0_23.10-1_amd64.Debian_12.deb"
- name: "mediainfo-gui"
download_url: "https://mediaarea.net/download/binary/mediainfo-gui/23.04/mediainfo-gui_23.04-1_amd64.Debian_11.deb"
package_name: "mediainfo-gui_23.04-1_amd64.Debian_11.deb"
download_url: "https://mediaarea.net/download/binary/mediainfo-gui/24.04/mediainfo-gui_24.04-1_amd64.Debian_12.deb"
package_name: "mediainfo-gui_24.04-1_amd64.Debian_12.deb"
- name: "mediaconch-gui"
download_url: "https://mediaarea.net/download/binary/mediaconch-gui/23.03/mediaconch-gui_23.03-1_amd64.Debian_11.deb"
package_name: "mediaconch-gui_23.03-1_amd64.Debian_11.deb"
download_url: "https://mediaarea.net/download/binary/mediaconch-gui/23.10/mediaconch-gui_23.10-1_amd64.Debian_12.deb"
package_name: "mediaconch-gui_23.10-1_amd64.Debian_12.deb"
8 changes: 4 additions & 4 deletions ansible/roles/viper.tools/files/home/Desktop/README.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,19 +67,19 @@ <h3 id="tweaking-the-virtualbox-machine">Tweaking the VirtualBox Machine</h3>
<h2 id="prototyping-decisions">Prototyping Decisions</h2>
<h3 id="vm-and-os">VM and OS</h3>
<p>There are a few flavours of VM for a particular OS. The project team have already
agreed that Debian 9 (Stretch) was a sensible starting choice. The two main criteria
agreed that Debian 12 (Bookworm) was a sensible starting choice. The two main criteria
that guided the decision were stability and long update cycles.</p>
<p><a href="https://www.virtualbox.org/">Virtual Box</a> was chosen as the virtualisation platform
because of its cross platform ubiquity. <a href="https://www.vagrantup.com/">Vagrant</a> is a
tool designed for building and managing virtual machine environments. It was chosen
to speed up the initial virtual box provisioning. <a href="https://app.vagrantup.com/">Vagrant Cloud</a>
provides a collection of cookie-cut virtual machines. The Vagrant machine chosen
as a starting point was an official Debian Stretch build with the addition of the
Virtual Box shared folder kernel module: <a href="https://app.vagrantup.com/debian/boxes/contrib-stretch64">https://app.vagrantup.com/debian/boxes/contrib-stretch64</a>.</p>
as a starting point was an official Debian Bookworm build with the addition of the
Virtual Box shared folder kernel module: <a href="https://app.vagrantup.com/debian/boxes/bookworm64">https://app.vagrantup.com/debian/boxes/bookworm64</a>.</p>
<h3 id="initialisation">Initialisation</h3>
<p>A vagrant machine is configured by a <a href="./Vagrantfile"><code>Vagrantfile</code></a> which can be
set up with the appropriate virtual machine template:</p>
<pre><code class="lang-shell"><span class="hljs-attribute">vagrant</span> init debian/contrib-stretch64
<pre><code class="lang-shell"><span class="hljs-attribute">vagrant</span> init debian/bookworm64
</code></pre>
<p>Before starting the machine we want to configure a few things out of the box. By default Vagrant machines are headless, i.e. all access via terminal and SSH with no GUI. We also need to provision the memory and number of CPUs available to the machine. While cores and memory are plentiful on a development workstation, 2 virtual CPUs and 4GB or RAM are sensible starting parameters. Anything requiring significantly more compute power would struggle to satisfy the accessible research environment brief. These parameters can be adjusted in situ regardless.</p>
<p>We can set these up for a Virtual Box VM by adding the following lines to our Vagrantfile, we&#39;ll also set a VM name while we&#39;re at it:</p>
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/viper.tools/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ galaxy_info:
platforms:
- name: Debian
versions:
- stretch
- bookworm
galaxy_tags:
- OPF
- DDHN
Expand Down
8 changes: 4 additions & 4 deletions docs/maintainer/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ You'll need at least familiarity with the following software and technologies to

### Operating system

[Debian 11 (Bullseye)](https://www.debian.org/) was chosen as a base OS. The two main criteria that guided the decision were stability and long update cycles.
[Debian 12 (Bookworm)](https://www.debian.org/) was chosen as a base OS. The two main criteria that guided the decision were stability and long update cycles.

### Virtualisation

- [VirtualBox](https://www.virtualbox.org/) was chosen as the virtualisation platform because of its cross platform ubiquity.
- [Vagrant](https://www.vagrantup.com/) is a tool designed for building and managing virtual machine environments. It was chosen to speed up the initial VirtualBox provisioning.
- [Vagrant Cloud](https://app.vagrantup.com/) provides a collection of cookie-cut virtual machines. The Vagrant machine chosen as a starting point was an official Debian Stretch build with the addition of the VirtualBox shared folder kernel module: <https://app.vagrantup.com/debian/boxes/contrib-stretch64>.
- [Vagrant Cloud](https://app.vagrantup.com/) provides a collection of cookie-cut virtual machines. The Vagrant machine chosen as a starting point was an official Debian Bookworm build with the addition of the VirtualBox shared folder kernel module: <https://app.vagrantup.com/debian/boxes/bookworm64>.

### Provisioning

Expand All @@ -45,10 +45,10 @@ The vagrant machine is configured by a [`Vagrantfile`](https://github.com/openpr
The VirtualBox VM is initialised with on the following line, which also selects the guest OS version:

```shell
config.vm.box = "debian/bullseye64"
config.vm.box = "debian/bookworm64"
```

This choses a 64 bit Debian 11 (Bullseye) image as the base OS.
This choses a 64 bit Debian 12 (Bookworm) image as the base OS.

#### VirtualBox configuration

Expand Down

0 comments on commit 247177e

Please sign in to comment.