fix arch in docker tag

hashicorp · Feb 23, 2024 · f446dc3 · f446dc3
1 parent 6e6d481
commit f446dc3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/consul-lambda/Makefile b/consul-lambda/Makefile
@@ -35,7 +35,7 @@ dev: dist
 #       We can set this here one time, once we're off CircleCI.
 # export DOCKER_BUILDKIT=1
 BUILD_ARGS = BIN_NAME=consul-lambda-registrator VERSION=$(VERSION) GIT_COMMIT=$(GIT_COMMIT) GIT_DIRTY=$(GIT_DIRTY)
-TAG        ?= $(BIN_NAME)/$(TARGET)/$(PLATFORM):$(VERSION)
+TAG        ?= $(BIN_NAME)/$(TARGET):$(VERSION)
 BA_FLAGS   = $(addprefix --build-arg=,$(BUILD_ARGS))
 FLAGS      = --load --platform $(PLATFORM) --tag $(TAG) $(BA_FLAGS)
 

diff --git a/test/acceptance/setup-terraform/ecr.tf b/test/acceptance/setup-terraform/ecr.tf
@@ -21,7 +21,7 @@ resource "null_resource" "push-lambda-registrator-to-ecr" {
     command = <<EOF
     aws ecr get-login-password --region ${var.region} | docker login --username AWS --password-stdin ${local.account_id}.dkr.ecr.${var.region}.amazonaws.com
     cd ../../../consul-lambda
-    make docker TAG=${aws_ecr_repository.lambda-registrator.repository_url}:${local.ecr_image_tag} ARCH=${var.arch}
+    make docker TAG=${aws_ecr_repository.lambda-registrator.repository_url}:${local.ecr_image_tag}-${var.arch} ARCH=${var.arch}
     docker push ${aws_ecr_repository.lambda-registrator.repository_url}:${local.ecr_image_tag}
     EOF
   }