Skip to content

Commit 2e5b9e2

Browse files
committed
switch to ubuntu focal -> jammy and cgroups v1 -> v2
1 parent 89cd96f commit 2e5b9e2

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# https://betterprogramming.pub/managing-virtual-machines-under-vagrant-on-a-mac-m1-aebc650bc12c
22
# https://github.com/rofrano/vagrant-docker-provider
33

4-
FROM ubuntu:focal
4+
FROM ubuntu:jammy
55

66
ENV DEBIAN_FRONTEND noninteractive
77

Vagrantfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Vagrant::configure("2") do |config|
6060

6161
machines.each_with_index do |machine, index|
6262

63-
config.vm.box = "generic/ubuntu2004"
63+
config.vm.box = "generic/ubuntu2204"
6464
config.vm.define machine[:name] do |config|
6565

6666
# config.disksize.size = machine[:disksize] # deprecated
@@ -365,6 +365,7 @@ Vagrant::configure("2") do |config|
365365
echo -e '\e[38;5;198m'"Vault http://localhost:8200 with $(cat /etc/vault/init.file | grep Root)"
366366
echo -e '\e[38;5;198m'"Consul http://localhost:8500"
367367
echo -e '\e[38;5;198m'"Nomad http://localhost:4646"
368+
echo -e '\e[33;1;93m'"Like HashiQube? Say thanks with a Star on GitHub: https://github.com/star3am/hashiqube"
368369
SHELL
369370

370371
end

Vagrantfile.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Vagrant::configure("2") do |config|
6060

6161
machines.each_with_index do |machine, index|
6262

63-
config.vm.box = "generic/ubuntu2004"
63+
config.vm.box = "generic/ubuntu2204"
6464
config.vm.define machine[:name] do |config|
6565

6666
# config.disksize.size = machine[:disksize] # deprecated
@@ -365,6 +365,7 @@ Vagrant::configure("2") do |config|
365365
echo -e '\e[38;5;198m'"Vault http://localhost:8200 with $(cat /etc/vault/init.file | grep Root)"
366366
echo -e '\e[38;5;198m'"Consul http://localhost:8500"
367367
echo -e '\e[38;5;198m'"Nomad http://localhost:4646"
368+
echo -e '\e[33;1;93m'"Like HashiQube? Say thanks with a Star on GitHub: https://github.com/star3am/hashiqube"
368369
SHELL
369370

370371
end

docker/docker.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ sudo add-apt-repository "deb [arch=$ARCH] https://download.docker.com/linux/ubun
1717
sudo apt-get update -qq < /dev/null > /dev/null
1818
# BUG: error reopening /dev/null https://bugs.launchpad.net/ubuntu/+source/docker.io/+bug/1950071 so we pin docker-ce=5:20.10.16~3-0~ubuntu-focal and containerd.io=1.5.11-1
1919
# BUG: https://github.com/containerd/containerd/issues/6203
20-
# INFO: failed to create shim task: OCI runtime create failed: runc create failed: unable to start container process: error during container init: error reopening /dev/null inside container: open /dev/null: operation not permitted: unknown
21-
sudo DEBIAN_FRONTEND=noninteractive apt-get install -qq --allow-downgrades --assume-yes docker-ce=5:20.10.9~3-0~ubuntu-focal docker-ce-cli containerd.io=1.5.11-1 docker-compose-plugin < /dev/null > /dev/null
20+
# FIXED: failed to create shim task: OCI runtime create failed: runc create failed: unable to start container process: error during container init: error reopening /dev/null inside container: open /dev/null: operation not permitted: unknown
21+
sudo DEBIAN_FRONTEND=noninteractive apt-get install -qq --allow-downgrades --assume-yes docker-ce docker-ce-cli containerd.io docker-compose-plugin < /dev/null > /dev/null
2222
sudo usermod -aG docker vagrant
2323
sudo mkdir -p /etc/docker
2424
# https://docs.docker.com/config/daemon/prometheus/

trex/trex-nodejs/views/pages/now.ejs

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<title>Display current date and time</title>
66
</head>
77
<body>
8-
<h1><span id="datetime"></span></h1>
8+
<span id="datetime"></span>
99

1010
<script>
1111
// create a function to update the date and time
@@ -14,13 +14,13 @@
1414
const now = new Date();
1515
1616
// get the current date and time as a string
17-
const currentDateTime = now.toLocaleString(undefined, {year: 'numeric', month: '2-digit', day: '2-digit', weekday:"long", hour: '2-digit', hour12: false, minute:'2-digit', second:'2-digit'}); // 'Wednesday, 14/06/2023, 13:43:57';
17+
const currentDateTime = now.toLocaleString(undefined, {year: 'numeric', month: '2-digit', day: '2-digit', weekday:"long", hour: '2-digit', hour12: false, minute:'2-digit'}); // 'Wednesday, 14/06/2023, 13:43';
1818
1919
// update the `textContent` property of the `span` element with the `id` of `datetime`
2020
document.querySelector('#datetime').textContent = currentDateTime;
2121
}
2222
23-
// call the `updateDateTime` function every second
23+
// call the `updateDateTime` function every minute
2424
setInterval(updateDateTime, 1000);
2525
</script>
2626
</body>

0 commit comments

Comments
 (0)