Skip to content

Commit

Permalink
Update module
Browse files Browse the repository at this point in the history
  • Loading branch information
craigthackerx committed Dec 11, 2023
1 parent 627f19b commit 8515e38
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion containers/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
8 changes: 4 additions & 4 deletions containers/ubuntu/packer.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand All @@ -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" {
Expand Down Expand Up @@ -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"
]
}

Expand Down

0 comments on commit 8515e38

Please sign in to comment.