Merge pull request #693 from ministryofjustice/DDLS-435b

DDLS-435 change rds scaling to min 0
ministryofjustice · Jan 21, 2025 · 83048a0 · 83048a0
2 parents 88cdb3e + a1e43c0
commit 83048a0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/serve-web/docker/app/Dockerfile b/serve-web/docker/app/Dockerfile
@@ -34,7 +34,7 @@ RUN apk update && apk upgrade
 # Add Waitforit to wait on db starting
 ENV WAITFORIT_VERSION="v2.4.1"
 
-RUN wget -q -O /usr/local/bin/waitforit https://github.com/maxcnunes/waitforit/releases/download/$WAITFORIT_VERSION/waitforit-linux_amd64 \
+RUN wget -q -O /usr/local/bin/waitforit https://github.com/maxclaus/waitforit/releases/download/$WAITFORIT_VERSION/waitforit-linux_amd64 \
   && chmod +x /usr/local/bin/waitforit
 
 #COMPOSER

diff --git a/serve-web/docker/waitforit/Dockerfile b/serve-web/docker/waitforit/Dockerfile
@@ -1,7 +1,6 @@
 FROM alpine
 
 ENV WAITFORIT_VERSION="v2.4.1"
-RUN wget -q -O /usr/local/bin/waitforit https://github.com/maxcnunes/waitforit/releases/download/$WAITFORIT_VERSION/waitforit-linux_amd64 \
+RUN wget -q -O /usr/local/bin/waitforit https://github.com/maxclaus/waitforit/releases/download/$WAITFORIT_VERSION/waitforit-linux_amd64 \
   && chmod +x /usr/local/bin/waitforit
 ENTRYPOINT ["/usr/local/bin/waitforit"]
-
diff --git a/serve-web/docker/web/Dockerfile b/serve-web/docker/web/Dockerfile
@@ -9,7 +9,7 @@ RUN wget -q -O /usr/local/bin/confd "https://github.com/kelseyhightower/confd/re
 
 # Add Waitforit to wait on app starting
 ENV WAITFORIT_VERSION="v2.4.1"
-RUN wget -q -O /usr/local/bin/waitforit https://github.com/maxcnunes/waitforit/releases/download/$WAITFORIT_VERSION/waitforit-linux_amd64 \
+RUN wget -q -O /usr/local/bin/waitforit https://github.com/maxclaus/waitforit/releases/download/$WAITFORIT_VERSION/waitforit-linux_amd64 \
   && chmod +x /usr/local/bin/waitforit
 
 WORKDIR /var/www

diff --git a/terraform/environment/rds.tf b/terraform/environment/rds.tf
@@ -84,7 +84,7 @@ resource "aws_rds_cluster" "cluster_serverless" {
   iam_database_authentication_enabled = false
 
   serverlessv2_scaling_configuration {
-    min_capacity = 0.5
+    min_capacity = 0
     max_capacity = 16
   }
   depends_on = [aws_cloudwatch_log_group.api_cluster]