Merge pull request #641 from plus3it/dependabot/docker/plus3it/tardig…

…rade-ci-0.24.14
plus3it · Nov 16, 2023 · 312d8c5 · 312d8c5
2 parents 73c10e9 + 0cb0b86
commit 312d8c5
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -28,7 +28,7 @@ pull_request_rules:
       - author~=dependabot\[bot\]|dependabot-preview\[bot\]
       - "#approved-reviews-by>=1"
       # Must pass codebuild jobs before merge
-      - status-success=codebuild/p3-spel-ci/pr
+      - status-success=codebuild/p3-spel-commercial-ci/pr
       - status-success=codebuild/p3-spel-govcloud-ci/pr
       - status-success=codebuild/p3-spel-vagrant-ci/pr
     actions:

diff --git a/Dockerfile b/Dockerfile
@@ -1 +1 @@
-FROM plus3it/tardigrade-ci:0.24.10
+FROM plus3it/tardigrade-ci:0.24.14
diff --git a/build/vagrant/Makefile b/build/vagrant/Makefile
@@ -46,6 +46,7 @@ build:
 		-var spel_repo_url=$(CODEBUILD_SOURCE_REPO_URL) \
 		-var spel_repo_commit=$(CODEBUILD_SOURCE_VERSION) \
 		-var spel_version=$(SPEL_VERSION) \
+		-var packer_version=$(PACKER_VERSION) \
 		build-spel-vagrant.pkr.hcl
 	@if [[ "$(SPEL_CI)" = "true" ]]; then \
 		echo "Moving "$(PACKER_LOG_DIR)" to .spel/ci" ;\

diff --git a/build/vagrant/build-spel-vagrant.pkr.hcl b/build/vagrant/build-spel-vagrant.pkr.hcl
@@ -8,6 +8,11 @@ variable "aws_temporary_security_group_source_cidrs" {
   default = ["0.0.0.0/0"]
 }
 
+variable "packer_version" {
+  type    = string
+  default = ""
+}
+
 variable "spel_ci" {
   type    = bool
   default = false
@@ -82,6 +87,7 @@ build {
   provisioner "shell" {
     environment_vars = [
       "PACKER_NO_COLOR=1",
+      "PACKER_VERSION=${var.packer_version}",
       "SPEL_CI=${var.spel_ci}",
       "SPEL_IDENTIFIER=${var.spel_identifier}",
       "SPEL_REPO_COMMIT=${var.spel_repo_commit}",

diff --git a/build/vagrant/build-spel-vagrant.sh b/build/vagrant/build-spel-vagrant.sh
@@ -11,6 +11,11 @@ then
     export EXCEPT_STEP
 fi
 
+if [[ -z "${PACKER_VERSION:-}" ]]
+then
+    unset PACKER_VERSION
+fi
+
 # update PATH
 export PATH="${HOME}/bin:${PATH}"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		FROM plus3it/tardigrade-ci:0.24.10
		FROM plus3it/tardigrade-ci:0.24.14