Skip to content

Commit 97b6435

Browse files
committed
fix: TT-509 pr comments
1 parent a4b8426 commit 97b6435

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@ RUN chown -R ${USERNAME}:${USERNAME} /var/cache/nginx && \
3737
chown -R ${USERNAME}:${USERNAME} /etc/nginx/conf.d
3838
RUN touch /var/run/nginx.pid && chown -R ${USERNAME}:${USERNAME} /var/run/nginx.pid
3939

40-
#USER ${USERNAME}
40+
# FIXME: Actually if we can deploy to azure in port 80 we need a root user
41+
# Maybe we can refactor this dockerfile to use root user directly this is not a good approach y
42+
# security terms. It's a good practice to have rootless in containers so for this
43+
# we can to refactor this dockerfile and the terraform module to deploy in other ports because
44+
# Ports below 1024 needs root permisions.
45+
46+
# USER ${USERNAME}
4147

4248
EXPOSE 80

infrastructure/main.tf

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,28 +32,20 @@ data "terraform_remote_state" "service" {
3232
}
3333
}
3434

35-
data "azurerm_container_registry" "registry" {
36-
name = data.terraform_remote_state.service.outputs.container_registry_name
37-
resource_group_name = data.terraform_remote_state.service.outputs.resource_group_name
38-
}
39-
40-
data "azurerm_resource_group" "root" {
41-
name = data.terraform_remote_state.service.outputs.resource_group_name
42-
}
43-
4435
locals {
4536
common_name = "time-tracker-ui"
4637
environment = terraform.workspace
4738
service_name = "${local.common_name}-${local.environment}"
4839
create_app_service_plan = true
4940
service_plan_kind = "Linux"
41+
docker_image_name = "timetracker_ui"
5042
}
5143

5244
module "ui" {
5345
source = "[email protected]:ioet/infra-terraform-modules.git//azure-app-service?ref=tags/v0.0.5"
5446
app_service_name = local.service_name
5547
create_app_service_plan = local.create_app_service_plan
56-
docker_image_name = var.docker_image_name
48+
docker_image_name = "${local.docker_image_name}:${var.docker_image_tag}"
5749
docker_image_namespace = data.azurerm_container_registry.registry.login_server
5850
docker_registry_password = data.azurerm_container_registry.registry.admin_password
5951
docker_registry_url = data.azurerm_container_registry.registry.login_server

0 commit comments

Comments
 (0)