Skip to content

add environment_variable to set docker image tag #365

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

Open
aagbsn wants to merge 1 commit into
base: main
Choose a base branch
from
+44 −7
Open

add environment_variable to set docker image tag #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 14 additions & 6 deletions tf/environments/dev/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,7 @@ module "ooniapi_ooniprobe_deployer" {
service_name = "ooniprobe"
repo = "ooni/backend"
branch_name = "test-userauth"
environment = local.environment
trigger_path = "ooniapi/services/ooniprobe/**"
buildspec_path = "ooniapi/services/ooniprobe/buildspec.yml"
codestar_connection_arn = aws_codestarconnections_connection.oonidevops.arn
Expand All @@ -576,7 +577,7 @@ module "ooniapi_ooniprobe" {
vpc_id = module.network.vpc_id

service_name = "ooniprobe"
default_docker_image_url = "ooni/api-ooniprobe:latest"
default_docker_image_url = "ooni/api-ooniprobe:dev"
stage = local.environment
dns_zone_ooni_io = local.dns_zone_ooni_io
key_name = module.adm_iam_roles.oonidevops_key_name
Expand Down Expand Up @@ -629,6 +630,7 @@ module "ooniapi_reverseproxy_deployer" {
service_name = "reverseproxy"
repo = "ooni/backend"
branch_name = "master"
environment = local.environment
trigger_path = "ooniapi/services/reverseproxy/**"
buildspec_path = "ooniapi/services/reverseproxy/buildspec.yml"
codestar_connection_arn = aws_codestarconnections_connection.oonidevops.arn
Expand All @@ -650,7 +652,7 @@ module "ooniapi_reverseproxy" {
vpc_id = module.network.vpc_id

service_name = "reverseproxy"
default_docker_image_url = "ooni/api-reverseproxy:latest"
default_docker_image_url = "ooni/api-reverseproxy:dev"
stage = local.environment
dns_zone_ooni_io = local.dns_zone_ooni_io
key_name = module.adm_iam_roles.oonidevops_key_name
Expand Down Expand Up @@ -902,6 +904,7 @@ module "fastpath_builder" {
service_name = "fastpath"
repo = "ooni/backend"
branch_name = "master"
environment = local.environment
buildspec_path = "fastpath/buildspec.yml"
trigger_path = "fastpath/**"
codestar_connection_arn = aws_codestarconnections_connection.oonidevops.arn
Expand All @@ -919,6 +922,7 @@ module "ooniapi_oonirun_deployer" {
service_name = "oonirun"
repo = "ooni/backend"
branch_name = "oonirun-v2-1"
environment = local.environment
buildspec_path = "ooniapi/services/oonirun/buildspec.yml"
trigger_path = "ooniapi/services/oonirun/**"
codestar_connection_arn = aws_codestarconnections_connection.oonidevops.arn
Expand All @@ -937,7 +941,7 @@ module "ooniapi_oonirun" {
vpc_id = module.network.vpc_id

service_name = "oonirun"
default_docker_image_url = "ooni/api-oonirun:latest"
default_docker_image_url = "ooni/api-oonirun:dev"
stage = local.environment
dns_zone_ooni_io = local.dns_zone_ooni_io
key_name = module.adm_iam_roles.oonidevops_key_name
Expand Down Expand Up @@ -968,6 +972,7 @@ module "ooniapi_oonifindings_deployer" {
service_name = "oonifindings"
repo = "ooni/backend"
branch_name = "master"
environment = local.environment
trigger_path = "ooniapi/services/oonifindings/**"
buildspec_path = "ooniapi/services/oonifindings/buildspec.yml"
codestar_connection_arn = aws_codestarconnections_connection.oonidevops.arn
Expand All @@ -986,7 +991,7 @@ module "ooniapi_oonifindings" {
vpc_id = module.network.vpc_id

service_name = "oonifindings"
default_docker_image_url = "ooni/api-oonifindings:latest"
default_docker_image_url = "ooni/api-oonifindings:dev"
stage = local.environment
dns_zone_ooni_io = local.dns_zone_ooni_io
key_name = module.adm_iam_roles.oonidevops_key_name
Expand Down Expand Up @@ -1018,6 +1023,7 @@ module "ooniapi_ooniauth_deployer" {
service_name = "ooniauth"
repo = "ooni/backend"
branch_name = "master"
environment = local.environment
buildspec_path = "ooniapi/services/ooniauth/buildspec.yml"
trigger_path = "ooniapi/services/ooniauth/**"
codestar_connection_arn = aws_codestarconnections_connection.oonidevops.arn
Expand All @@ -1036,7 +1042,7 @@ module "ooniapi_ooniauth" {
vpc_id = module.network.vpc_id

service_name = "ooniauth"
default_docker_image_url = "ooni/api-ooniauth:latest"
default_docker_image_url = "ooni/api-ooniauth:dev"
stage = local.environment
dns_zone_ooni_io = local.dns_zone_ooni_io
key_name = module.adm_iam_roles.oonidevops_key_name
Expand Down Expand Up @@ -1086,6 +1092,7 @@ module "ooniapi_oonimeasurements_deployer" {
service_name = "oonimeasurements"
repo = "ooni/backend"
branch_name = "event-detector"
environment = local.environment
trigger_path = "ooniapi/services/oonimeasurements/**"
buildspec_path = "ooniapi/services/oonimeasurements/buildspec.yml"
codestar_connection_arn = aws_codestarconnections_connection.oonidevops.arn
Expand All @@ -1105,7 +1112,7 @@ module "ooniapi_oonimeasurements" {
vpc_id = module.network.vpc_id

service_name = "oonimeasurements"
default_docker_image_url = "ooni/api-oonimeasurements:latest"
default_docker_image_url = "ooni/api-oonimeasurements:dev"
stage = local.environment
dns_zone_ooni_io = local.dns_zone_ooni_io
key_name = module.adm_iam_roles.oonidevops_key_name
Expand Down Expand Up @@ -1230,6 +1237,7 @@ module "testlists_builder" {
service_name = "testlists"
repo = "ooni/backend"
branch_name = "master"
environment = local.environment
buildspec_path = "ooniapi/services/testlists/buildspec.yml"
trigger_path = "ooniapi/services/testlists/**"
codestar_connection_arn = aws_codestarconnections_connection.oonidevops.arn
Expand Down
8 changes: 8 additions & 0 deletions tf/environments/prod/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,7 @@ module "ooniapi_reverseproxy_deployer" {
service_name = "reverseproxy"
repo = "ooni/backend"
branch_name = "master"
environment = local.environment
trigger_path = "ooniapi/services/reverseproxy/**"
buildspec_path = "ooniapi/services/reverseproxy/buildspec.yml"
codestar_connection_arn = aws_codestarconnections_connection.oonidevops.arn
Expand Down Expand Up @@ -778,6 +779,7 @@ module "ooniapi_ooniprobe_deployer" {
service_name = "ooniprobe"
repo = "ooni/backend"
branch_name = "master"
environment = local.environment
trigger_path = "ooniapi/services/ooniprobe/**"
buildspec_path = "ooniapi/services/ooniprobe/buildspec.yml"
codestar_connection_arn = aws_codestarconnections_connection.oonidevops.arn
Expand Down Expand Up @@ -927,6 +929,7 @@ module "fastpath_builder" {
service_name = "fastpath"
repo = "ooni/backend"
branch_name = "master"
environment = local.environment
buildspec_path = "fastpath/buildspec.yml"
trigger_path = "fastpath/**"
codestar_connection_arn = aws_codestarconnections_connection.oonidevops.arn
Expand All @@ -945,6 +948,7 @@ module "ooniapi_oonirun_deployer" {
service_name = "oonirun"
repo = "ooni/backend"
branch_name = "master"
environment = local.environment
trigger_path = "ooniapi/services/oonirun/**"
buildspec_path = "ooniapi/services/oonirun/buildspec.yml"
codestar_connection_arn = aws_codestarconnections_connection.oonidevops.arn
Expand Down Expand Up @@ -994,6 +998,7 @@ module "ooniapi_oonifindings_deployer" {
service_name = "oonifindings"
repo = "ooni/backend"
branch_name = "master"
environment = local.environment
trigger_path = "ooniapi/services/oonifindings/**"
buildspec_path = "ooniapi/services/oonifindings/buildspec.yml"
codestar_connection_arn = aws_codestarconnections_connection.oonidevops.arn
Expand Down Expand Up @@ -1044,6 +1049,7 @@ module "ooniapi_ooniauth_deployer" {
service_name = "ooniauth"
repo = "ooni/backend"
branch_name = "master"
environment = local.environment
trigger_path = "ooniapi/services/ooniauth/**"
buildspec_path = "ooniapi/services/ooniauth/buildspec.yml"
codestar_connection_arn = aws_codestarconnections_connection.oonidevops.arn
Expand Down Expand Up @@ -1113,6 +1119,7 @@ module "ooniapi_oonimeasurements_deployer" {
service_name = "oonimeasurements"
repo = "ooni/backend"
branch_name = "master"
environment = local.environment
trigger_path = "ooniapi/services/oonimeasurements/**"
buildspec_path = "ooniapi/services/oonimeasurements/buildspec.yml"
codestar_connection_arn = aws_codestarconnections_connection.oonidevops.arn
Expand Down Expand Up @@ -1263,6 +1270,7 @@ module "testlists_builder" {
service_name = "testlists"
repo = "ooni/backend"
branch_name = "master"
environment = local.environment
buildspec_path = "ooniapi/services/testlists/buildspec.yml"
trigger_path = "ooniapi/services/testlists/**"
codestar_connection_arn = aws_codestarconnections_connection.oonidevops.arn
Expand Down
6 changes: 6 additions & 0 deletions tf/modules/ooni_docker_build/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ data "aws_caller_identity" "current" {}

locals {
account_id = data.aws_caller_identity.current.account_id
env_label = var.environment == "prod" ? "latest" : "dev"
}

resource "aws_iam_policy" "codebuild" {
Expand Down Expand Up @@ -122,6 +123,11 @@ resource "aws_codebuild_project" "oonidkr" {
image_pull_credentials_type = "CODEBUILD"
privileged_mode = "true"
type = "LINUX_CONTAINER"

environment_variable {
name = "ENV_LABEL"
value = local.env_label
}
}

logs_config {
Expand Down
7 changes: 6 additions & 1 deletion tf/modules/ooni_docker_build/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,9 @@ variable "ecs_cluster_name" {

variable "trigger_path" {
description = "path filter for push changes which trigger the codepipeline eg. ooniapi/services/oonirun/**"
}
}

variable "environment" {
description = "Deployment environment (e.g., prod, dev)"
type = string
}
6 changes: 6 additions & 0 deletions tf/modules/ooniapi_service_deployer/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ data "aws_caller_identity" "current" {}

locals {
account_id = data.aws_caller_identity.current.account_id
env_label = var.environment == "prod" ? "latest" : "dev"
}

resource "aws_iam_policy" "codebuild" {
Expand Down Expand Up @@ -122,6 +123,11 @@ resource "aws_codebuild_project" "ooniapi" {
image_pull_credentials_type = "CODEBUILD"
privileged_mode = "true"
type = "LINUX_CONTAINER"

environment_variable {
name = "ENV_LABEL"
value = local.env_label
}
}

logs_config {
Expand Down
4 changes: 4 additions & 0 deletions tf/modules/ooniapi_service_deployer/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,7 @@ variable "ecs_service_name" {
description = "id of the service in the cluster to deploy"
}

variable "environment" {
description = "Deployment environment (e.g., prod, dev)"
type = string
}