inteligr8/acs-community-packaging
1
0
Fork 0
mirror of https://github.com/Alfresco/acs-community-packaging.git synced 2025-09-17 14:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update release version to 6.3.0-<dev_release> + uncomment apply amps

Browse Source 
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.
This commit is contained in:
David Edwards
2020-02-28 11:43:56 +00:00
parent ce784460e9
commit 0580c3820a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -102,7 +102,7 @@ matrix:
if: fork = false AND branch = feature/REPO-4735_Add-release-stages-2 AND commit_message !~ /\[no-release\]/ if: fork = false AND branch = feature/REPO-4735_Add-release-stages-2 AND commit_message !~ /\[no-release\]/
# Leaving blank will auto increment the # Leaving blank will auto increment the
env: env:
- release_version=repo-4735-2-2 - release_version=6.3.0-repo-4735-2-2
- development_version=6.3.0-alpha-6-SNAPSHOT - development_version=6.3.0-alpha-6-SNAPSHOT
- COMM_RELEASE_VERSION= - 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) # Fail the job if there is a docker image tag that matches the release_version (or project version in the POM if not set)

4
docker-alfresco/Dockerfile
View File

@@ -46,8 +46,8 @@ RUN mkdir -p ${TOMCAT_DIR}/amps \
COPY target/amps ${TOMCAT_DIR}/amps COPY target/amps ${TOMCAT_DIR}/amps
# Install amps on alfresco.war # Install amps on alfresco.war
# RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install \ RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install \
# ${TOMCAT_DIR}/amps ${TOMCAT_DIR}/webapps/alfresco -directory -nobackup -force ${TOMCAT_DIR}/amps ${TOMCAT_DIR}/webapps/alfresco -directory -nobackup -force
# Docker CMD from parent image starts the server # Docker CMD from parent image starts the server