Merge pull request #772 from digirati-co-uk/feature/FAC-preparation

v2.2.0

Author: stephenwf

.env

@@ -36,7 +36,7 @@ SMTP_USER=project.1
 SMTP_PASSWORD=secret.1
 
 MAIL_FROM_USER="Madoc local <noreply@madoc.io>"
-MADOC_INSTALLATION_CODE='$2b$14$eofdZp3nY.HyK68a9zCfoOs3fuphxHRAR/KhckFm.8Qi8sEmgMcCK'
+MADOC_INSTALLATION_CODE='$2b$14$9qnqDtpUMt7PQ0bs300y8el116vUbm4nF8Bf5vltCx78ZzuAWBu/K'
 
 # HTTPS
 # LOCAL PORT FOR HTTPS, CAN BE CHANGED

.github/workflows/madoc-ts-docker.yaml

@@ -68,6 +68,10 @@ jobs:
           push: ${{ github.actor != 'dependabot[bot]' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            BUILD_TIME=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
+            BUILD_VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
+            BUILD_REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}