MAP-1602 (#711)

* MAP-1602 * MAP-1602 library update * MAP-1602 allow list * MAP-1602 fixing merge issue
ministryofjustice · Sep 18, 2024 · c0d8ee5 · c0d8ee5
1 parent b3bd41a
commit c0d8ee5
Show file tree

Hide file tree

Showing 15 changed files with 137 additions and 598 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  hmpps: ministryofjustice/hmpps@6
+  hmpps: ministryofjustice/hmpps@9.5.0
 
 parameters:
   alerts-slack-channel:
@@ -154,6 +154,8 @@ workflows:
       - hmpps/deploy_env:
           name: deploy_dev
           env: "dev"
+          pipeline_id: <<pipeline.id>>
+          pipeline_number: <<pipeline.number>>
           context: hmpps-common-vars
           filters:
             branches:
@@ -171,6 +173,8 @@ workflows:
       - hmpps/deploy_env:
           name: deploy_preprod
           env: "preprod"
+          pipeline_id: <<pipeline.id>>
+          pipeline_number: <<pipeline.number>>
           context:
             - hmpps-common-vars
             - use-of-force-preprod
@@ -183,6 +187,8 @@ workflows:
       - hmpps/deploy_env:
           name: deploy_prod
           env: "prod"
+          pipeline_id: <<pipeline.id>>
+          pipeline_number: <<pipeline.number>>
           slack_notification: true
           slack_channel_name: << pipeline.parameters.releases-slack-channel >>
           context:

diff --git a/Dockerfile b/Dockerfile
@@ -64,7 +64,6 @@ COPY --from=builder --chown=appuser:appgroup \
 ENV PORT=3000
 
 EXPOSE 3000
-ENV NODE_ENV='production'
 USER 2000
 
 CMD [ "npm", "start" ]
diff --git a/helm_deploy/use-of-force/Chart.yaml b/helm_deploy/use-of-force/Chart.yaml
@@ -5,9 +5,12 @@ name: use-of-force
 version: 0.1.1
 
 dependencies:
+  - name: generic-service
+    version: 3.5
+    repository: https://ministryofjustice.github.io/hmpps-helm-charts
   - name: generic-prometheus-alerts
-    version: 1.1.0
+    version: 1.8
     repository: https://ministryofjustice.github.io/hmpps-helm-charts
   - name: generic-data-analytics-extractor
-    version: 1.1.0
+    version: 1.1.1
     repository: https://ministryofjustice.github.io/hmpps-helm-charts
diff --git a/helm_deploy/use-of-force/templates/NOTES.txt b/helm_deploy/use-of-force/templates/NOTES.txt
diff --git a/helm_deploy/use-of-force/templates/_envs.tpl b/helm_deploy/use-of-force/templates/_envs.tpl
diff --git a/helm_deploy/use-of-force/templates/_helpers.tpl b/helm_deploy/use-of-force/templates/_helpers.tpl
diff --git a/helm_deploy/use-of-force/templates/deployment.yaml b/helm_deploy/use-of-force/templates/deployment.yaml
diff --git a/helm_deploy/use-of-force/templates/ingress_v1_2.yaml b/helm_deploy/use-of-force/templates/ingress_v1_2.yaml