Merge of Hapi 7.0.0 branch into main

.gitignore

@@ -3,6 +3,8 @@ target/
 src/main/resources/validation.json
 src/main/resources/nhs-validation.json
 src/main/resources/implementationGuides/*.tgz
+src/main/resources/static/web/*.*
+src/main/resources/static/app/*.*
 src/uk.nhs.digital.fhir.fwoa.main/resources/*.tgz
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/
@@ -38,3 +40,5 @@ build/
 
 ### VS Code ###
 .vscode/
+/interoperability-standards-tools-skunkworks/.angular/cache/17.1.3/angular-webpack/a1dba4dffcba8d84d9c03b2ef4d54bb9f8f40d2d/0.pack
+/interoperability-standards-tools-skunkworks/.angular/cache/17.1.3/angular-webpack/a1dba4dffcba8d84d9c03b2ef4d54bb9f8f40d2d/index.pack

.gitmodules

@@ -0,0 +1,5 @@
+[submodule "interoperability-standards-tools-skunkworks"]
+	path = interoperability-standards-tools-skunkworks
+	url = https://github.com/NHSDigital/interoperability-standards-tools-skunkworks
+
+

Dockerfile

@@ -1,10 +1,11 @@
-FROM eclipse-temurin:18.0.2
+FROM openjdk:23
 
 VOLUME /tmp
 
-ENV JAVA_OPTS="-Xms128m -Xmx2048m"
+ENV JAVA_OPTS="-Xms128m -Xmx8192m"
 
 ADD target/fhir-validator.jar fhir-validator.jar
+EXPOSE 9001
 
 ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/fhir-validator.jar"]
 

cloudformation/IOPSValidation.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: "2010-09-09"
-Description: NHS Digital IOPS FHIR Services
+Description: NHS England Interoperability Standards FHIR Services
 
 Parameters:
   OntoClientId:

deploy-notes.md

@@ -0,0 +1,27 @@
+## General 
+
+Do this first if app has changed or app code is not present in the static folder
+(may need to run `git submodule update` (maybe `git submodule foreach git pull`) and `npm install`)
+
+Run these separately as the angular has different location for the swagger pages
+
+### docker
+
+`mvn clean install -P dockerBuild,dockerRelease`
+
+### AWS ECR
+
+`aws ecr get-login-password --region eu-west-2 | docker login --username AWS --password-stdin 365027538941.dkr.ecr.eu-west-2.amazonaws.com`
+
+`mvn clean install -P dockerBuild,awsRelease`
+
+Run 
+
+`mvn spring-boot:run` and check correct app is working on http://localhost:9001
+
+### Cloud Formation Notes
+
+Do not use
+
+aws cloudformation deploy --template-file C:\Development\NHSDigital\validation-service-fhir-r4\cloudfront\IOPSValidation.yaml --stack-name test-stack
+