mirror of
https://github.com/maxkratz/edgedb-vm.git
synced 2024-09-08 00:03:45 +00:00
Merge pull request #5 from maxkratz/feature/ubuntu-24.04-upgrade
Updates base (X)Ubuntu image to 24.04
This commit is contained in:
commit
f57645c6df
4 changed files with 14 additions and 4 deletions
2
.github/workflows/vagrant-up.yml
vendored
2
.github/workflows/vagrant-up.yml
vendored
|
@ -35,7 +35,7 @@ jobs:
|
|||
- name: clean up old Vagrant artifacts
|
||||
run: |
|
||||
vagrant destroy edgedb || true
|
||||
vagrant box remove gusztavvargadr/xubuntu-desktop-2204-lts || true
|
||||
vagrant box remove gusztavvargadr/xubuntu-desktop-2404-lts || true
|
||||
# https://stackoverflow.com/a/71346341
|
||||
- name: clean up old GitHub Actions runner build folder
|
||||
run: |
|
||||
|
|
|
@ -7,7 +7,7 @@ This repository is used to automatically build an [EdgeDB](https://www.edgedb.co
|
|||
|
||||
## Packages/Configuration
|
||||
|
||||
- [Ubuntu 22.04](https://app.vagrantup.com/gusztavvargadr/boxes/xubuntu-desktop-2204-lts)
|
||||
- [Ubuntu 24.04](https://app.vagrantup.com/gusztavvargadr/boxes/xubuntu-desktop-2404-lts)
|
||||
- [EdgeDB](https://www.edgedb.com/)
|
||||
|
||||
|
||||
|
|
2
Vagrantfile
vendored
2
Vagrantfile
vendored
|
@ -1,7 +1,7 @@
|
|||
token = ENV["GITHUB_TOKEN"]
|
||||
|
||||
Vagrant.configure("2") do |config|
|
||||
config.vm.box = "gusztavvargadr/xubuntu-desktop-2204-lts"
|
||||
config.vm.box = "gusztavvargadr/xubuntu-desktop-2404-lts"
|
||||
config.vm.define 'edgedb'
|
||||
config.vm.provider :virtualbox do |vb|
|
||||
vb.name = "edgedb"
|
||||
|
|
12
prov.sh
12
prov.sh
|
@ -39,11 +39,18 @@ sudo mkdir -p /usr/local/share/keyrings && \
|
|||
-o /usr/local/share/keyrings/edgedb-keyring.gpg \
|
||||
https://packages.edgedb.com/keys/edgedb-keyring.gpg
|
||||
|
||||
# Currently, `jammy` as workaround because the EdgeDB apt repo does not
|
||||
# contain a release for `noble`
|
||||
echo deb [signed-by=/usr/local/share/keyrings/edgedb-keyring.gpg] \
|
||||
https://packages.edgedb.com/apt \
|
||||
$(grep "VERSION_CODENAME=" /etc/os-release | cut -d= -f2) main \
|
||||
jammy main \
|
||||
| sudo tee /etc/apt/sources.list.d/edgedb.list
|
||||
|
||||
# Workaround for `noble`: Install libicu70 manually
|
||||
sudo wget http://de.archive.ubuntu.com/ubuntu/pool/main/i/icu/libicu70_70.1-2_amd64.deb
|
||||
sudo apt-get install -y ./libicu70_70.1-2_amd64.deb
|
||||
sudo rm ./libicu70_70.1-2_amd64.deb
|
||||
|
||||
sudo apt-get update && sudo apt-get install -y edgedb-3
|
||||
|
||||
sudo systemctl enable --now edgedb-server-3
|
||||
|
@ -62,6 +69,9 @@ Icon=web-browser
|
|||
|
||||
chmod u+x /home/vagrant/Desktop/*.desktop
|
||||
|
||||
sudo mv /home/vagrant/Desktop/*.desktop /usr/share/xubuntu/applications/
|
||||
sudo ln -s /usr/share/xubuntu/applications/edgedb-admin-ui.desktop /home/vagrant/Desktop/edgedb-admin-ui.desktop
|
||||
|
||||
# Enable the admin UI
|
||||
sudo cp /lib/systemd/system/edgedb-server-3.service /etc/systemd/system/edgedb-server-3.service
|
||||
sudo sed -i '/Environment=EDGEDATA=\/var\/lib\/edgedb\/3\/data\//a Environment=EDGEDB_SERVER_ADMIN_UI=enabled' /etc/systemd/system/edgedb-server-3.service
|
||||
|
|
Loading…
Reference in a new issue