vagrant: upgrade to ubuntu jammy (#42)

OWASP · May 6, 2022 · 78d8213 · 78d8213
1 parent a431271
commit 78d8213
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/deploy/vagrant/Vagrantfile b/deploy/vagrant/Vagrantfile
@@ -9,7 +9,7 @@ Vagrant.configure("2") do |config|
     v.cpus = 1
   end
 
-  config.vm.box = "ubuntu/focal64"
+  config.vm.box = "ubuntu/jammy64"
   config.vm.hostname = "crapi"
   config.vm.network "private_network", ip: "192.168.33.20"
   config.vm.synced_folder "../../", "/tmp/crapi"

diff --git a/deploy/vagrant/provisioner.sh b/deploy/vagrant/provisioner.sh
@@ -21,15 +21,15 @@ set -e
 
 # Add docker key and repository
 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
-echo "deb [arch=amd64] https://download.docker.com/linux/ubuntu xenial stable" | sudo tee /etc/apt/sources.list.d/docker.list
+echo "deb [arch=amd64] https://download.docker.com/linux/ubuntu jammy stable" | sudo tee /etc/apt/sources.list.d/docker.list
 
 # Install and docker
 apt update -q
 apt upgrade -qy
 apt install -qy docker-ce
 
 # Install docker-compose
-curl -sL https://github.com/docker/compose/releases/download/1.18.0-rc2/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
+curl -sL https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
 chmod +x /usr/local/bin/docker-compose
 ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose
 
@@ -41,7 +41,6 @@ mkdir /opt/crapi
 
 cp "$MOUNT_DIR/deploy/docker/docker-compose.yml" /opt/crapi \
     && sed -i /opt/crapi/docker-compose.yml \
-        -e "s/version: '3.7'/version: '3.3'/" \
         -e "s/127.0.0.1:8888:80/80:80/" \
         -e "s/127.0.0.1:8025:8025/8025:8025/"
 cp "$MOUNT_DIR/deploy/vagrant/crapi.service" /etc/systemd/system/ \