From b1d348884b1799e1f6259da9b4c1143edf0a2c68 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Thu, 23 Jul 2020 16:46:37 +0100 Subject: [PATCH] - docker-compose-minimal.yml did not have the keystore section version in the image with transforms. --- .travis.yml | 2 -- .../environment/docker-compose-minimal+transforms.yml | 1 - packaging/tests/environment/docker-compose-minimal.yml | 7 ++++++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6b2a03aae1..5303f27aea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,8 +37,6 @@ before_install: - "cp .travis.settings.xml $HOME/.m2/settings.xml" - travis_retry mvn install -DskipTests=true -Dversion.edition=Community -PcommunityDocker -B -V -# Hello Sara - jobs: include: - stage: test diff --git a/packaging/tests/environment/docker-compose-minimal+transforms.yml b/packaging/tests/environment/docker-compose-minimal+transforms.yml index 44fb1569b1..b7a912e07b 100644 --- a/packaging/tests/environment/docker-compose-minimal+transforms.yml +++ b/packaging/tests/environment/docker-compose-minimal+transforms.yml @@ -10,7 +10,6 @@ services: image: alfresco/alfresco-community-repo-base:latest environment: CATALINA_OPTS : "-agentlib:jdwp=transport=dt_socket,address=*:8000,server=y,suspend=n" - # Some properties are built in Dockerfile because of cron expressions JAVA_OPTS : " -Ddb.driver=org.postgresql.Driver diff --git a/packaging/tests/environment/docker-compose-minimal.yml b/packaging/tests/environment/docker-compose-minimal.yml index 965f23c7d8..4d6c6e06ce 100644 --- a/packaging/tests/environment/docker-compose-minimal.yml +++ b/packaging/tests/environment/docker-compose-minimal.yml @@ -36,7 +36,12 @@ services: -Dimap.server.port=1143 -Dftp.port=1221 -Dcors.enabled=true - -Dcors.allowed.origins=http://localhost:4200 + -Dcors.allowed.origins=http://localhost:4200,http://localhost:8080 + + -Dmetadata-keystore.password=mp6yc0UD9e + -Dmetadata-keystore.aliases=metadata + -Dmetadata-keystore.metadata.password=mp6yc0UD9e + -Dmetadata-keystore.metadata.algorithm=AES " ports: - 8082:8080