Skip to content

Commit ed4bc78

Browse files
authored
Support for Ubuntu 20.04 Focal Fossa (#20)
This change makes it possible to run omegaUp on Ubuntu 20.04 Focal Fossa. This should allow us to be ready by the time it's released.
1 parent 2dfb898 commit ed4bc78

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

Vagrantfile

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@
22
# vi: set ft=ruby :
33

44
Vagrant.configure("2") do |config|
5-
config.vm.box = "omegaup/dev"
6-
config.vm.box_version = "2.0.3"
5+
config.vm.box = "omegaup/dev-focal"
76

87
# Redirige localhost:8080 hacia el puerto 80 de la VM
98
config.vm.network :forwarded_port, guest: 80, host_ip: "127.0.0.1", host: 8080
10-
# Expone el puerto del servicio del backend.
11-
config.vm.network :forwarded_port, guest: 21680, host_ip: "127.0.0.1", host: 21680
129

1310
# Permite usar las llaves SSH del host en la VM
1411
config.ssh.forward_agent = true

linux-install.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ EOF
5555
sudo tee "${vm_yaml}" > /dev/null <<EOF
5656
---
5757
version: 5
58+
59+
php::globals::php_version: '7.4'
5860
EOF
5961
fi
6062
if [ -n "${github_username}" ] && \
@@ -63,13 +65,15 @@ EOF
6365
---
6466
version: 5
6567
68+
php::globals::php_version: '7.4'
69+
6670
omegaup::github_remotes:
6771
origin: ${github_username}/omegaup
6872
EOF
6973
fi
7074
}
7175

72-
install_packages puppet ruby git
76+
install_packages puppet ruby git virtualbox-guest-dkms virtualbox-guest-x11
7377
install_r10k
7478
install_hiera_yaml
7579
sudo r10k puppetfile install --puppetfile="${CURRENT_DIR}/Puppetfile"

packer/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
PACKER_VERSION=1.4.3
1+
PACKER_VERSION=1.5.4
22

33
.PHONY: all
44
all: packer_virtualbox-ovf_virtualbox.box packer box/box.ovf
@@ -13,5 +13,5 @@ packer:
1313

1414
box/box.ovf:
1515
mkdir -p box
16-
curl http://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64-vagrant.box | tar -x -C box
16+
curl http://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64-vagrant.box | tar -x -C box
1717
./resize.py box

packer/vagrant-box.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"builders": [{
33
"type": "virtualbox-ovf",
44
"communicator": "ssh",
5-
"boot_wait": "20s",
5+
"boot_wait": "120s",
6+
"ssh_wait_timeout": "10000s",
67
"ssh_username": "vagrant",
78
"ssh_password": "vagrant",
89
"ssh_private_key_file": "vagrant",

0 commit comments

Comments
 (0)