format packer, cleanup, trig ci

laluka · Apr 1, 2024 · 7a88e51 · 7a88e51
1 parent d298250
commit 7a88e51
Showing 1 changed file with 5 additions and 13 deletions.
diff --git a/packer/lbt-docker.pkr.hcl b/packer/lbt-docker.pkr.hcl
@@ -31,11 +31,10 @@ build {
   name = "lbt-pre-install"
 
   source "source.docker.lbt" {
-    image = "ubuntu:22.04"
+    image  = "ubuntu:22.04"
     commit = true
   }
 
-  # DEV ONLY
   provisioner "file" {
     source      = "."
     destination = "/opt/lalubuntu"
@@ -50,11 +49,8 @@ build {
       "(id;date) | tee /.provisionned_by_packer",
       "apt-get update",
       "apt-get install -y curl vim git wget tzdata sudo",
-      // "git clone https://github.com/laluka/lalubuntu",
-      // "mv lalubuntu /opt/lalubuntu",
       "git config --global --add safe.directory /opt/lalubuntu",
       "cd /opt/lalubuntu",
-      "git checkout lalu/rolling-1709719668", // Dev Time Only
       "bash -x packer/create-user.sh",
       "echo \"hacker ALL=(ALL) NOPASSWD: ALL # TMPHACK_INSTALL_ONLY\" | tee -a /etc/sudoers",
       "su hacker -c \"bash -x pre-install.sh\"",
@@ -85,7 +81,6 @@ build {
     pull   = false
   }
 
-  # DEV ONLY
   provisioner "file" {
     source      = "."
     destination = "/opt/lalubuntu"
@@ -97,11 +92,8 @@ build {
       "TZ=Etc/UTC",
     ]
     inline = [
-      // "git clone https://github.com/laluka/lalubuntu",
-      // "mv lalubuntu /opt/lalubuntu",
       "git config --global --add safe.directory /opt/lalubuntu",
       "cd /opt/lalubuntu",
-      "git checkout lalu/rolling-1709719668", // Dev Time Only
       "echo \"hacker ALL=(ALL) NOPASSWD: ALL # TMPHACK_INSTALL_ONLY\" | tee -a /etc/sudoers",
       "sudo -u hacker -- bash -xlc \"ansible-playbook -v -i inventory.ini main.yml --tags base-install\"",
       "sed -i /TMPHACK_INSTALL_ONLY/d /etc/sudoers", # Remove tmp hack for user rights
@@ -125,9 +117,9 @@ build {
   name = "lbt-offensive-stuff"
 
   source "source.docker.lbt" {
-    image = "thelaluka/lalubuntu:base-install"
+    image  = "thelaluka/lalubuntu:base-install"
     commit = true
-    pull  = false
+    pull   = false
   }
 
   provisioner "shell" {
@@ -160,9 +152,9 @@ build {
   name = "lbt-gui-tools"
 
   source "source.docker.lbt" {
-    image = "thelaluka/lalubuntu:offensive-stuff"
+    image  = "thelaluka/lalubuntu:offensive-stuff"
     commit = true
-    pull  = false
+    pull   = false
   }
 
   provisioner "shell" {