From 0580c3820aa9fc53ce79e0f83ea61d47d0b73485 Mon Sep 17 00:00:00 2001 From: David Edwards Date: Fri, 28 Feb 2020 11:43:56 +0000 Subject: [PATCH] Update release version to 6.3.0- + uncomment apply amps The warfile generated doesn't recognise the repo-xxxx- release version and has a version of 0.0.0. This may be the cause of the docker file errors. --- .travis.yml | 2 +- docker-alfresco/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f2da1287e..af8d860f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -102,7 +102,7 @@ matrix: if: fork = false AND branch = feature/REPO-4735_Add-release-stages-2 AND commit_message !~ /\[no-release\]/ # Leaving blank will auto increment the env: - - release_version=repo-4735-2-2 + - release_version=6.3.0-repo-4735-2-2 - development_version=6.3.0-alpha-6-SNAPSHOT - COMM_RELEASE_VERSION= # Fail the job if there is a docker image tag that matches the release_version (or project version in the POM if not set) diff --git a/docker-alfresco/Dockerfile b/docker-alfresco/Dockerfile index 9b591984d..f8727cf4b 100644 --- a/docker-alfresco/Dockerfile +++ b/docker-alfresco/Dockerfile @@ -46,8 +46,8 @@ RUN mkdir -p ${TOMCAT_DIR}/amps \ COPY target/amps ${TOMCAT_DIR}/amps # Install amps on alfresco.war -# RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install \ -# ${TOMCAT_DIR}/amps ${TOMCAT_DIR}/webapps/alfresco -directory -nobackup -force +RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install \ + ${TOMCAT_DIR}/amps ${TOMCAT_DIR}/webapps/alfresco -directory -nobackup -force # Docker CMD from parent image starts the server