From 3cd4e69963a6697978025bf899fc8f3ed13ee994 Mon Sep 17 00:00:00 2001
From: HelgeCPH <ropf@itu.dk>
Date: Thu, 22 Feb 2024 11:48:38 +0100
Subject: [PATCH] Upgrade image, simplify docker setup, and migrate to compose
 v2

---
 Vagrantfile            | 34 ++++++++++++++++------------------
 remote_files/deploy.sh |  4 ++--
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index f94d669..61b288e 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -8,13 +8,13 @@ Vagrant.configure("2") do |config|
 
   config.vm.synced_folder "remote_files", "/minitwit", type: "rsync"
   config.vm.synced_folder '.', '/vagrant', disabled: true
-  
+
   config.vm.define "minitwit", primary: true do |server|
 
     server.vm.provider :digital_ocean do |provider|
       provider.ssh_key_name = "do_ssh_key"
       provider.token = ENV["DIGITAL_OCEAN_TOKEN"]
-      provider.image = 'ubuntu-20-04-x64'
+      provider.image = 'ubuntu-22-04-x64'
       provider.region = 'fra1'
       provider.size = 's-1vcpu-1gb'
     end
@@ -23,23 +23,21 @@ Vagrant.configure("2") do |config|
 
     server.vm.provision "shell", inline: 'echo "export DOCKER_USERNAME=' + "'" + ENV["DOCKER_USERNAME"] + "'" + '" >> ~/.bash_profile'
     server.vm.provision "shell", inline: 'echo "export DOCKER_PASSWORD=' + "'" + ENV["DOCKER_PASSWORD"] + "'" + '" >> ~/.bash_profile'
-    
+
     server.vm.provision "shell", inline: <<-SHELL
-    
-    # Install docker and docker-compose
-    sudo apt install -y apt-transport-https ca-certificates curl software-properties-common
-    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-    sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu focal stable"
-    apt-cache policy docker-ce
-    sudo apt install -y docker-ce
+
+    sudo apt-get update
+
+    # The following address an issue in DO's Ubuntu images, which still contain a lock file
+    sudo killall apt apt-get
+    sudo rm /var/lib/dpkg/lock-frontend
+
+    # Install docker and docker compose
+    sudo apt-get install -y docker.io docker-compose-v2
+
     sudo systemctl status docker
-    sudo usermod -aG docker ${USER}
-    sudo apt install -y docker-compose
-    
+    # sudo usermod -aG docker ${USER}
 
-    # Install make
-    sudo apt-get install -y make
-    
     echo -e "\nVerifying that docker works ...\n"
     docker run --rm hello-world
     docker rmi hello-world
@@ -58,10 +56,10 @@ Vagrant.configure("2") do |config|
     echo "cd /minitwit" >> ~/.bash_profile
 
     chmod +x /minitwit/deploy.sh
-    
+
     echo -e "\nVagrant setup done ..."
     echo -e "minitwit will later be accessible at http://$(hostname -I | awk '{print $1}'):5000"
-    echo -e "The mysql database needs a minute to initialize, if the landing page is stack-trace ..."
+    echo -e "The mysql database needs a minute to initialize, if the landing page shows an error stack-trace ..."
     SHELL
   end
 end
diff --git a/remote_files/deploy.sh b/remote_files/deploy.sh
index f469675..3a70e9b 100755
--- a/remote_files/deploy.sh
+++ b/remote_files/deploy.sh
@@ -2,6 +2,6 @@ source ~/.bash_profile
 
 cd /minitwit
 
-docker-compose -f docker-compose.yml pull
-docker-compose -f docker-compose.yml up -d
+docker compose -f docker-compose.yml pull
+docker compose -f docker-compose.yml up -d
 docker pull $DOCKER_USERNAME/flagtoolimage:latest
\ No newline at end of file