build(packer): pkr

Cosmian · Jun 17, 2024 · 38c5e41 · 38c5e41
1 parent 15a627c
commit 38c5e41
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 30 deletions.
diff --git a/.github/scripts/aws-packer-build.sh b/.github/scripts/aws-packer-build.sh
@@ -11,8 +11,10 @@ VOLUME_SIZE=20
 set
 
 if [ "$DISTRIBUTION" = "ubuntu" ]; then
+  SSH_USERNAME="ubuntu"
   TEMPLATE_DISTRIBUTION="ubuntu"
 else
+  SSH_USERNAME="ec2-user"
   TEMPLATE_DISTRIBUTION="redhat"
 fi
 
@@ -26,6 +28,7 @@ sed -i "s#TEMPLATE_IMAGE_NAME#$IMAGE_NAME#g" "$PACKER_FILE"
 sed -i "s#TEMPLATE_SOURCE_AMI#$SOURCE_AMI#g" "$PACKER_FILE"
 sed -i "s#TEMPLATE_SUPPORT#$SUPPORT#g" "$PACKER_FILE"
 sed -i "s#TEMPLATE_VOLUME_SIZE#$VOLUME_SIZE#g" "$PACKER_FILE"
+sed -i "s#TEMPLATE_SSH_USERNAME#$SSH_USERNAME#g" "$PACKER_FILE"
 sed -i "s#TEMPLATE_DEVICE_NAME#$DEVICE_NAME#g" "$PACKER_FILE"
 sed -i "s#TEMPLATE_VOLUME_TYPE#$VOLUME_TYPE#g" "$PACKER_FILE"
 sed -i "s#TEMPLATE_DISTRIBUTION#$TEMPLATE_DISTRIBUTION#g" "$PACKER_FILE"

diff --git a/packer/aws.pkr.hcl b/packer/aws.pkr.hcl
@@ -12,7 +12,7 @@ packer {
 }
 
 source "amazon-ebssurrogate" "TEMPLATE_DISTRIBUTION" {
-  ssh_username              = "packer"
+  ssh_username              = "TEMPLATE_SSH_USERNAME"
   ssh_timeout               = "5m"
   ssh_clear_authorized_keys = true
   source_ami                = "TEMPLATE_SOURCE_AMI"
@@ -49,14 +49,4 @@ build {
     use_proxy       = false
     extra_arguments = ["-e", "cosmian_vm_version=TEMPLATE_COSMIAN_VM_VERSION", "-e", "cosmian_kms_version=TEMPLATE_COSMIAN_KMS_VERSION", "-e", "cosmian_ai_runner_version=TEMPLATE_COSMIAN_AI_RUNNER_VERSION"]
   }
-
-  provisioner "shell" {
-    skip_clean        = true
-    expect_disconnect = true
-    inline = [
-      "rm -f /etc/sudoers.d/90-cloud-init-users",
-      "/usr/sbin/userdel -r -f packer ",
-    ]
-  }
-
 }
diff --git a/packer/azure.pkr.hcl b/packer/azure.pkr.hcl
@@ -62,13 +62,4 @@ build {
     use_proxy       = false
     extra_arguments = ["-e", "cosmian_vm_version=TEMPLATE_COSMIAN_VM_VERSION", "-e", "cosmian_kms_version=TEMPLATE_COSMIAN_KMS_VERSION", "-e", "cosmian_ai_runner_version=TEMPLATE_COSMIAN_AI_RUNNER_VERSION"]
   }
-
-  provisioner "shell" {
-    skip_clean = true
-    expect_disconnect = true
-    inline = [
-      "rm -f /etc/sudoers.d/90-cloud-init-users",
-      "/usr/sbin/userdel -r -f packer ",
-    ]
-  }
 }
diff --git a/packer/gcp.pkr.hcl b/packer/gcp.pkr.hcl
@@ -12,7 +12,7 @@ packer {
 }
 
 source "googlecompute" "TEMPLATE_GOOGLE_COMPUTE" {
-  ssh_username              = "packer"
+  ssh_username              = "root"
   ssh_timeout               = "5m"
   ssh_clear_authorized_keys = true
   project_id                = "cosmian-dev"
@@ -37,13 +37,4 @@ build {
     use_proxy       = false
     extra_arguments = ["-e", "cosmian_vm_version=TEMPLATE_COSMIAN_VM_VERSION", "-e", "cosmian_kms_version=TEMPLATE_COSMIAN_KMS_VERSION", "-e", "cosmian_ai_runner_version=TEMPLATE_COSMIAN_AI_RUNNER_VERSION"]
   }
-
-  provisioner "shell" {
-    skip_clean = true
-    expect_disconnect = true
-    inline = [
-      "rm -f /etc/sudoers.d/90-cloud-init-users",
-      "/usr/sbin/userdel -r -f packer ",
-    ]
-  }
 }