From 8515e383ca600da1cbdc4b6b25fb5a0a2fb64186 Mon Sep 17 00:00:00 2001
From: Craig Thacker <craigthackerx@gmail.com>
Date: Mon, 11 Dec 2023 21:44:22 +0000
Subject: [PATCH] Update module

---
 containers/ubuntu/Dockerfile     | 3 ++-
 containers/ubuntu/packer.pkr.hcl | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/containers/ubuntu/Dockerfile b/containers/ubuntu/Dockerfile
index 4b3dbef..2065fa8 100644
--- a/containers/ubuntu/Dockerfile
+++ b/containers/ubuntu/Dockerfile
@@ -1,6 +1,7 @@
 FROM ubuntu:latest
 
-LABEL org.opencontainers.image.source=https://github.com/cyber-scot/azuredevops-agents
+LABEL org.opencontainers.image.title=ubuntu-cicd-base
+LABEL org.opencontainers.image.source=https://github.com/cyber-scot/base-images
 
 RUN rm -rf /bin/sh && ln -sf /bin/bash /bin/sh
 
diff --git a/containers/ubuntu/packer.pkr.hcl b/containers/ubuntu/packer.pkr.hcl
index 74995e4..11224b0 100644
--- a/containers/ubuntu/packer.pkr.hcl
+++ b/containers/ubuntu/packer.pkr.hcl
@@ -10,7 +10,7 @@ packer {
 variable "container_name" {
   description = "The name of the container name"
   type        = string
-  default     = "ci-cd-base"
+  default     = "ubuntu-ci-cd-base"
 }
 
 variable "license" {
@@ -22,7 +22,7 @@ variable "license" {
 variable "name" {
   description = "The name of the image"
   type        = string
-  default     = "cicd-base"
+  default     = "ubuntu-cicd-base"
 }
 
 variable "normal_user" {
@@ -217,8 +217,8 @@ build {
     environment_vars = ["DEBIAN_FRONTEND=noninteractive", "PATH=${local.path_var}", "USER=${var.normal_user}"]
     execute_command  = "sudo -Hu ${var.normal_user} sh -c '{{ .Vars }} {{ .Path }}'"
     inline = [
-      "pip3 install --user pipenv virtualenv terraform-compliance checkov pywinrm",
-      "pip3 install --user azure-cli"
+      "pip install --user pipenv virtualenv terraform-compliance checkov pywinrm",
+      "pip install --user azure-cli"
     ]
 }