Fix coversheet template

.gitlab-ci.yml

@@ -20,7 +20,7 @@ stages:
 Build pythonForPandocFilter docker image:
   stage: build
   before_script: cd generateChangemarks
-  script: docker build --tag generatechangemarks:latest -f dockerfile .
+  script: docker build --tag generatechangemarks:$CI_COMMIT_BRANCH -f dockerfile .
   rules:
     - if: $CI_COMMIT_BRANCH
       changes:

generate_changemarks.sh

 #!/bin/bash
 
 FORGELIB_DOCKER_IMAGE=forge.3gpp.org:5050/tools/3gpp-scripts/forgelib:v2.5.0
-GENERATE_CHANGEMARKS_DOCKER_IMAGE=generatechangemarks:latest
+GENERATE_CHANGEMARKS_DOCKER_IMAGE=generatechangemarks:master
 DOCKER_IMAGE=pandoc/core:3.1.1.0
 
 echo "\n------ Checking for docker image --------"
@@ -30,9 +30,12 @@ for i in out/*.md ;  do
 	docker run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$GENERATE_CHANGEMARKS_DOCKER_IMAGE" pandocFilter -o "/tmp/out" "/tmp/$i"
 	echo "\n------ Publishing spec --------" 
 	docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) "$DOCKER_IMAGE" "/data/$i" -f markdown -t docx --reference-doc "Spec-template.docx" -o "/data/out/${DOCUMENT_NAME}.docx"
+    #docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) "$DOCKER_IMAGE" "/data/$i" -f markdown -t html -o "/data/out/${DOCUMENT_NAME}.html"
+    #docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) "$DOCKER_IMAGE" "/data/out/${DOCUMENT_NAME}.html" -f html -t docx --reference-doc "Spec-template.docx" -o "/data/out/${DOCUMENT_NAME}.docx"
 done
 
 echo "\n------ Combining docx --------"
+#docker container run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$FORGELIB_DOCKER_IMAGE" forgelib-changedocs -vv -sf "/tmp/out/" --preprocessor onem2m --outPath=/tmp/docs --startdelimiter "/tmp/$4" --enddelimiter "/tmp/$5" --coversheet "/tmp/$6" "$HOST_URL" "$2" "$3"
 docker container run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$FORGELIB_DOCKER_IMAGE" forgelib-changedocs -vv -sf "/tmp/out/" --preprocessor onem2m --outPath=/tmp/docs --startdelimiter "/tmp/$4" --enddelimiter "/tmp/$5" --coversheet "/tmp/$6" "$HOST_URL" "$2" "$3"
 
 echo "\n------ Converting to tracked changes docx --------"
@@ -41,4 +44,4 @@ for i in docs/*.docx ; do
 	docker container run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$GENERATE_CHANGEMARKS_DOCKER_IMAGE" addTrackedChanges -o "/tmp/docs/$DOCUMENT_NAME" "/tmp/$i" "$HOST_URL" "$2" "$3"
 done
 
-exit 0
+exit 0
\ No newline at end of file