Merge pull request #49 from WorldHealthOrganization/fix/dev-setup-wit…

…h-docker-compose fix: added logs mounting to docker compose
WorldHealthOrganization · Jan 31, 2023 · ab3e843 · ab3e843
2 parents c827857 + 2a3da60
commit ab3e843
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -18,6 +18,7 @@ services:
     image: world-health-organization/ddcc-gateway
     volumes:
       - ./certs:/ec/prod/app/san/dgc
+      - ./logs:/logs
     ports:
       - 8080:8080
     environment:
@@ -29,6 +30,8 @@ services:
       - DGC_TRUSTANCHOR_KEYSTOREPATH=/ec/prod/app/san/dgc/ta.jks
       - DGC_TRUSTANCHOR_KEYSTOREPASS=dgcg-p4ssw0rd # do not use this for production deployments
       - DGC_TRUSTANCHOR_CERTIFICATEALIAS=dgcg_trust_anchor
+      - DGC_FEDERATION_KEYSTOREPATH=/ec/prod/app/san/dgc/ta.jks #TODO: change to federation.jks
+      - DGC_FEDERATION_KEYSTOREPASSWORD=dgcg-p4ssw0rd # do not use this for production deployments
     depends_on:
       - mysql
     networks:

diff --git a/src/main/resources/db/changelog/add-trusted-reference-url-column.xml b/src/main/resources/db/changelog/add-trusted-reference-url-column.xml
@@ -9,6 +9,6 @@
         <addColumn tableName="trusted_reference">
             <column name="url" type="varchar(100)"/>
         </addColumn>
-        <addNotNullConstraint tableName="trusted_reference" columnName="url"/>
+        <addNotNullConstraint tableName="trusted_reference" columnName="url" columnDataType="varchar(100)"/>
     </changeSet>
 </databaseChangeLog>