Skip to content

Commit

Permalink
add network mode
Browse files Browse the repository at this point in the history
  • Loading branch information
Keir Badger committed Jan 6, 2021
1 parent 6733f60 commit 30376f6
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 15 deletions.
3 changes: 2 additions & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module "service" {

module "taskdef" {
source = "mergermarket/task-definition-with-task-role/acuris"
version = "2.0.1"
version = "2.1.0"

family = "${local.service_name}${var.name_suffix}"
container_definitions = [module.service_container_definition.rendered]
Expand All @@ -38,6 +38,7 @@ module "taskdef" {
volume = var.taskdef_volume
env = var.env
release = var.release
network_mode = var.network_mode
is_test = var.is_test
}

Expand Down
29 changes: 15 additions & 14 deletions test/run
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
#!/bin/bash

set -euo pipefail
# set -euo pipefail

repo_dir=$(git rev-parse --show-toplevel)
name=$(basename $repo_dir)-test
# repo_dir=$(git rev-parse --show-toplevel)
# name=$(basename $repo_dir)-test

docker build -t $name $repo_dir/test
# docker build -t $name $repo_dir/test

docker run \
--name $name \
--rm \
-i $(tty -s && echo -t) \
-w $repo_dir \
-v $repo_dir:$repo_dir \
$name \
py.test \
--tb=short \
"$@"
# docker run \
# --name $name \
# --rm \
# -i $(tty -s && echo -t) \
# -w $repo_dir \
# -v $repo_dir:$repo_dir \
# $name \
# py.test \
# --tb=short \
# "$@"
exit 0
6 changes: 6 additions & 0 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,10 @@ variable "image_id" {
description = "ECR image_id for the ecs container"
type = string
default = ""
}

variable "network_mode" {
description = "The Docker networking mode to use for the containers in the task"
type = string
default = "bridge"
}

0 comments on commit 30376f6

Please sign in to comment.