diff --git a/Dockerfile b/Dockerfile index 217121453..ce19d1b4c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,6 +40,7 @@ RUN if [[ ! -z $PACKAGE ]]; \ then \ pnpm --filter $PACKAGE build ; \ pnpm --filter $PACKAGE --prod deploy /tmp/app ; \ + cp core/.env.docker /tmp/app/.env ; \ fi # Necessary, perhaps, due to https://github.com/prisma/prisma/issues/15852 @@ -52,11 +53,6 @@ RUN if [[ ${PACKAGE} == core ]]; \ cp -a {}/. /tmp/app/{}/" ; \ fi -RUN if [[ ${PACKAGE} == core ]]; \ - then \ - cp core/.env.docker /tmp/app/.env ; \ - fi - ################################################################################ # Create a new stage to run the application with minimal runtime dependencies # where the necessary files are copied from the build stage. diff --git a/infrastructure/terraform/aws/main.tf b/infrastructure/terraform/aws/main.tf index 7a5116f6e..cac062ac7 100644 --- a/infrastructure/terraform/aws/main.tf +++ b/infrastructure/terraform/aws/main.tf @@ -67,6 +67,7 @@ module "service_core" { { name = "NEXT_PUBLIC_PUBPUB_URL", value = var.pubpub_url }, { name = "MAILGUN_SMTP_USERNAME", value = var.MAILGUN_SMTP_USERNAME }, { name = "NEXT_PUBLIC_SUPABASE_URL", value = var.NEXT_PUBLIC_SUPABASE_URL }, + { name = "NEXT_PUBLIC_SUPABASE_PUBLIC_KEY", value = var.NEXT_PUBLIC_SUPABASE_PUBLIC_KEY }, ] secrets = [ diff --git a/infrastructure/terraform/aws/modules/v7-cluster/main.tf b/infrastructure/terraform/aws/modules/v7-cluster/main.tf index 1eb607aa2..3ef01928b 100644 --- a/infrastructure/terraform/aws/modules/v7-cluster/main.tf +++ b/infrastructure/terraform/aws/modules/v7-cluster/main.tf @@ -171,6 +171,7 @@ resource "aws_lb_listener" "http" { } } +# TODO - add ACM certificates to support TLS # logging diff --git a/infrastructure/terraform/aws/variables.tf b/infrastructure/terraform/aws/variables.tf index be212d1bc..9fb84425c 100644 --- a/infrastructure/terraform/aws/variables.tf +++ b/infrastructure/terraform/aws/variables.tf @@ -28,6 +28,10 @@ variable "NEXT_PUBLIC_SUPABASE_URL" { description = "URL to Supabase public address for this install" type = string } +variable "NEXT_PUBLIC_SUPABASE_PUBLIC_KEY" { + description = "Supabase anon public key" + type = string +} # TODO deprecate this in favor of a Terraformed bucket variable "ASSETS_BUCKET_NAME" {