Update patient contract, update makefile for formelio pushes

formelio · May 22, 2024 · 55c4546 · 55c4546
1 parent eca8ece
commit 55c4546
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/auth/contract/store.go b/auth/contract/store.go
@@ -56,9 +56,9 @@ var StandardContractTemplates = TemplateStore{
 			Locale:             "nl_NL",
 			SignerAttributes:   StandardSignerAttributes,
 			// TODO: Fix the template and the regexp
-			Template:           `NL:PatientLogin:v1 Hierbij verklaar ik te handelen in naam van {{{` + LegalEntityAttr + `}}} te {{{` + LegalEntityCityAttr + `}}}. Deze verklaring is geldig van {{` + ValidFromAttr + `}} tot {{` + ValidToAttr + `}}.`,
+			Template:           `NL:PatientLogin:v1 Ik verklaar gegevens op te halen namens {{{` + LegalEntityAttr + `}}} te {{{` + LegalEntityCityAttr + `}}}. Deze verklaring is geldig van {{` + ValidFromAttr + `}} tot {{` + ValidToAttr + `}}.`,
 			TemplateAttributes: []string{LegalEntityAttr, LegalEntityCityAttr, ValidFromAttr, ValidToAttr},
-			Regexp:             `NL:PatientLogin:v1 Hierbij verklaar ik te handelen in naam van (.+) te (.+). Deze verklaring is geldig van (.+) tot (.+).`,
+			Regexp:             `NL:PatientLogin:v1 Ik verklaar gegevens op te halen namens (.+) te (.+). Deze verklaring is geldig van (.+) tot (.+).`,
 		},
 	}},
 	"EN": {"PractitionerLogin": {

diff --git a/makefile b/makefile
@@ -94,5 +94,7 @@ GIT_VERSION ?= "$(shell git name-rev --tags --name-only $(shell git rev-parse HE
 build:
 	go build -ldflags="-w -s -X 'github.com/nuts-foundation/nuts-node/core.GitCommit=${GIT_COMMIT}' -X 'github.com/nuts-foundation/nuts-node/core.GitBranch=${GIT_BRANCH}' -X 'github.com/nuts-foundation/nuts-node/core.GitVersion=${GIT_VERSION}'" -o ${OUTPUT}
 
+IMAGE_ENV ?= dev
 docker:
-	docker build --build-arg GIT_COMMIT=${GIT_COMMIT} --build-arg GIT_BRANCH=${GIT_BRANCH} --build-arg GIT_VERSION=${GIT_VERSION} -t nutsfoundation/nuts-node:latest .
+	docker build --build-arg GIT_COMMIT=${GIT_COMMIT} --build-arg GIT_BRANCH=${GIT_BRANCH} --build-arg GIT_VERSION=${GIT_VERSION} -t europe-west4-docker.pkg.dev/ivido-development/ivido-${IMAGE_ENV}/nuts-node:v5.3.2-formelio1 .
+	docker push europe-west4-docker.pkg.dev/ivido-development/ivido-${IMAGE_ENV}/nuts-node:v5.3.2-formelio1