Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix docker clobbering #114

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix docker clobbering #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a2b1df
fix docker clobbering
rzlim08 Aug 12, 2023
ee16d51
add tertiary
rzlim08 Aug 12, 2023
f99f8de
linting
rzlim08 Aug 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ localstack-test: image start-localstack wait-for-healthy deploy-localstack test
image:
source environment.test; \
docker buildx build --platform linux/amd64 --cache-from ghcr.io/chanzuckerberg/swipe:latest -t ghcr.io/chanzuckerberg/swipe:$$(cat version) .
docker tag ghcr.io/chanzuckerberg/swipe:$$(cat version) swipe:$$(cat version)

wait-for-healthy:
while true; do \
Expand Down
5 changes: 3 additions & 2 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,14 @@ module "batch_queue" {
}

locals {
version = file("${path.module}/version")
version = file("${path.module}/version")
docker_image_path = var.app_name == "swipe-test" ? "swipe" : "ghcr.io/chanzuckerberg/swipe"
}

module "sfn" {
source = "./terraform/modules/swipe-sfn"
app_name = var.app_name
batch_job_docker_image = "ghcr.io/chanzuckerberg/swipe:${chomp(local.version)}"
batch_job_docker_image = "${local.docker_image_path}:${chomp(local.version)}"
batch_spot_job_queue_arn = module.batch_queue.batch_spot_job_queue_arn
batch_on_demand_job_queue_arn = module.batch_queue.batch_on_demand_job_queue_arn
miniwdl_dir = var.miniwdl_dir
Expand Down
Loading