inteligr8/alfresco-sdk
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-sdk.git synced 2025-05-26 17:25:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #512 from Alfresco/sdk-4/archetypes-docker

Browse Source 
Archetypes - Several improvements
This commit is contained in:
Jose Luis Osorno 2018-12-20 08:59:58 +01:00 committed by GitHub
commit c2f94e35bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 75 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/alfresco-global.properties
View File

@ -74,4 +74,6 @@ db.url=jdbc:postgresql://${rootArtifactId}-postgres:5432/alfresco
# File servers related properties
# For local runs we disable CIFS and FTP
cifs.enabled=false
ftp.enabled=false
ftp.enabled=false
csrf.filter.enabled=false

14
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
View File

@ -24,7 +24,7 @@ services:
- "${symbol_dollar}{acs.port}:8080"
- "${symbol_dollar}{acs.debug.port}:8888"
volumes:
- alf-acs-volume:/usr/local/tomcat/alf_data
- ${rootArtifactId}-acs-volume:/usr/local/tomcat/alf_data
depends_on:
- ${rootArtifactId}-postgres
${rootArtifactId}-postgres:
@ -36,7 +36,7 @@ services:
ports:
- "${symbol_dollar}{postgres.port}:5432"
volumes:
- alf-db-volume:/var/lib/postgresql/data
- ${rootArtifactId}-db-volume:/var/lib/postgresql/data
${rootArtifactId}-ass:
image: alfresco/alfresco-search-services:1.2.0
environment:
@ -48,12 +48,12 @@ services:
ports:
- "8983:8983"
volumes:
- alf-ass-volume:/opt/alfresco-search-services/contentstore
- alf-ass-volume:/opt/alfresco-search-services/data
- ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/contentstore
- ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/data
volumes:
alf-acs-volume:
${rootArtifactId}-acs-volume:
external: true
alf-db-volume:
${rootArtifactId}-db-volume:
external: true
alf-ass-volume:
${rootArtifactId}-ass-volume:
external: true

12
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat
View File

@ -62,9 +62,9 @@ echo "Usage: %0 {build_start|start|stop|purge|tail|reload_share|reload_acs|build
EXIT /B %ERRORLEVEL%
:start
docker volume create alf-acs-volume
docker volume create alf-db-volume
docker volume create alf-ass-volume
docker volume create ${rootArtifactId}-acs-volume
docker volume create ${rootArtifactId}-db-volume
docker volume create ${rootArtifactId}-ass-volume
docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d
EXIT /B 0
:start_share
@ -100,7 +100,7 @@ EXIT /B 0
call mvn verify -pl integration-tests
EXIT /B 0
:purge
docker volume rm alf-acs-volume
docker volume rm alf-db-volume
docker volume rm alf-ass-volume
docker volume rm ${rootArtifactId}-acs-volume
docker volume rm ${rootArtifactId}-db-volume
docker volume rm ${rootArtifactId}-ass-volume
EXIT /B 0

12
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh
View File

@ -4,9 +4,9 @@
export COMPOSE_FILE_PATH=${symbol_dollar}{PWD}/target/classes/docker/docker-compose.yml
start() {
docker volume create alf-acs-volume
docker volume create alf-db-volume
docker volume create alf-ass-volume
docker volume create ${rootArtifactId}-acs-volume
docker volume create ${rootArtifactId}-db-volume
docker volume create ${rootArtifactId}-ass-volume
docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH up --build -d
}
@ -23,9 +23,9 @@ down() {
}
purge() {
docker volume rm alf-acs-volume
docker volume rm alf-db-volume
docker volume rm alf-ass-volume
docker volume rm ${rootArtifactId}-acs-volume
docker volume rm ${rootArtifactId}-db-volume
docker volume rm ${rootArtifactId}-ass-volume
}
build() {

2
archetypes/alfresco-allinone-archetype/src/test/resources/projects/basic/goal.txt
View File

@ -1 +1 @@
verify -Dmaven.test.skip=true
verify -DskipTests=true

1
archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/goal.txt
View File

@ -1 +0,0 @@
install -Dalfresco.platform.version=@@alfresco.enterprise.default.version@@ -Dalfresco.share.version=@@alfresco.enterprise.default.version@@ -Dmaven.alfresco.edition=enterprise

4
archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise42/archetype.properties
View File

@ -1,4 +0,0 @@
version=1.0
groupId=archetype.it
artifactId=allInOneTestRunEnterpriseFourTwo
package=it.pkg

1
archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise42/goal.txt
View File

@ -1 +0,0 @@
install -Dalfresco.platform.version=4.2.7 -Dalfresco.share.version=4.2.7 -Dmaven.alfresco.edition=enterprise

4
archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise50/archetype.properties
View File

@ -1,4 +0,0 @@
version=0.1-SNAPSHOT
groupId=archetype.it
artifactId=allInOneTestRunEnterpriseFiveZero
package=it.pkg

1
archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise50/goal.txt
View File

@ -1 +0,0 @@
install -Dalfresco.platform.version=5.0 -Dalfresco.share.version=5.0 -Dmaven.alfresco.edition=enterprise

1
archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise51/goal.txt
View File

@ -1 +0,0 @@
install -Dalfresco.platform.version=5.1 -Dalfresco.share.version=5.1 -Dmaven.alfresco.edition=enterprise

2
archetypes/alfresco-allinone-archetype/src/test/resources/projects/run/goal.txt
View File

@ -1 +1 @@
install
install -DskipTests

2
archetypes/alfresco-share-jar-archetype/src/test/resources/projects/run-enterprise/archetype.properties → archetypes/alfresco-allinone-archetype/src/test/resources/projects/runenterprise60/archetype.properties
View File

@ -1,4 +1,4 @@
version=0.1-SNAPSHOT
groupId=archetype.it
artifactId=shareJarTestRunEnterprise
artifactId=allInOneTestRunEnterpriseSixZero
package=it.pkg

1
archetypes/alfresco-allinone-archetype/src/test/resources/projects/runenterprise60/goal.txt Normal file
View File

@ -0,0 +1 @@
install -DskipTests -Dalfresco.bomDependencyArtifactId="acs-packaging" -Dalfresco.platform.version="6.0.0.2" -Dalfresco.share.version="6.0" -Dalfresco.platform.docker.image="alfresco/alfresco-content-repository" -Dalfresco.share.docker.image="alfresco/alfresco-share"

14
archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
View File

@ -20,7 +20,7 @@ services:
- "${symbol_dollar}{acs.port}:8080"
- "${symbol_dollar}{acs.debug.port}:8888"
volumes:
- alf-acs-volume:/usr/local/tomcat/alf_data
- ${rootArtifactId}-acs-volume:/usr/local/tomcat/alf_data
depends_on:
- ${rootArtifactId}-postgres
${rootArtifactId}-postgres:
@ -32,7 +32,7 @@ services:
ports:
- "${symbol_dollar}{postgres.port}:5432"
volumes:
- alf-db-volume:/var/lib/postgresql/data
- ${rootArtifactId}-db-volume:/var/lib/postgresql/data
${rootArtifactId}-ass:
image: alfresco/alfresco-search-services:1.2.0
environment:
@ -44,12 +44,12 @@ services:
ports:
- "8983:8983"
volumes:
- alf-ass-volume:/opt/alfresco-search-services/contentstore
- alf-ass-volume:/opt/alfresco-search-services/data
- ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/contentstore
- ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/data
volumes:
alf-acs-volume:
${rootArtifactId}-acs-volume:
external: true
alf-db-volume:
${rootArtifactId}-db-volume:
external: true
alf-ass-volume:
${rootArtifactId}-ass-volume:
external: true

12
archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.bat
View File

@ -50,9 +50,9 @@ echo "Usage: %0 {build_start|start|stop|purge|tail|build_test|test}"
EXIT /B %ERRORLEVEL%
:start
docker volume create alf-acs-volume
docker volume create alf-db-volume
docker volume create alf-ass-volume
docker volume create ${rootArtifactId}-acs-volume
docker volume create ${rootArtifactId}-db-volume
docker volume create ${rootArtifactId}-ass-volume
docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d
EXIT /B 0
:down
@ -69,7 +69,7 @@ EXIT /B 0
call mvn verify
EXIT /B 0
:purge
docker volume rm alf-acs-volume
docker volume rm alf-db-volume
docker volume rm alf-ass-volume
docker volume rm ${rootArtifactId}-acs-volume
docker volume rm ${rootArtifactId}-db-volume
docker volume rm ${rootArtifactId}-ass-volume
EXIT /B 0

12
archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.sh
View File

@ -4,9 +4,9 @@
export COMPOSE_FILE_PATH=${symbol_dollar}{PWD}/target/classes/docker/docker-compose.yml
start() {
docker volume create alf-acs-volume
docker volume create alf-db-volume
docker volume create alf-ass-volume
docker volume create ${rootArtifactId}-acs-volume
docker volume create ${rootArtifactId}-db-volume
docker volume create ${rootArtifactId}-ass-volume
docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH up --build -d
}
@ -15,9 +15,9 @@ down() {
}
purge() {
docker volume rm alf-acs-volume
docker volume rm alf-db-volume
docker volume rm alf-ass-volume
docker volume rm ${rootArtifactId}-acs-volume
docker volume rm ${rootArtifactId}-db-volume
docker volume rm ${rootArtifactId}-ass-volume
}
build() {

4
archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/alfresco-global.properties
View File

@ -74,4 +74,6 @@ db.url=jdbc:postgresql://${rootArtifactId}-postgres:5432/alfresco
# File servers related properties
# For local runs we disable CIFS and FTP
cifs.enabled=false
ftp.enabled=false
ftp.enabled=false
csrf.filter.enabled=false

2
archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/basic/goal.txt
View File

@ -1 +1 @@
verify -Dmaven.test.skip=true
verify -DskipTests=true

4
archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-enterprise/archetype.properties
View File

@ -1,4 +0,0 @@
version=0.1-SNAPSHOT
groupId=archetype.it
artifactId=repoJarTestRunEnterprise
package=it.pkg

1
archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-enterprise/goal.txt
View File

@ -1 +0,0 @@
install -Dalfresco.platform.version=@@alfresco.enterprise.default.version@@ -Dmaven.alfresco.edition=@@alfresco.sdk.default.edition@@

2
archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/archetype.properties → archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/runenterprise60/archetype.properties
View File

@ -1,4 +1,4 @@
version=0.1-SNAPSHOT
groupId=archetype.it
artifactId=allInOneTestRunEnterprise
artifactId=repoJarTestRunEnterpriseSixZero
package=it.pkg

1
archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/runenterprise60/goal.txt Normal file
View File

@ -0,0 +1 @@
install -DskipTests -Dalfresco.bomDependencyArtifactId="acs-packaging" -Dalfresco.platform.version="6.0.0.2" -Dalfresco.share.version="6.0" -Dalfresco.platform.docker.image="alfresco/alfresco-content-repository" -Dalfresco.share.docker.image="alfresco/alfresco-share"

15
archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
View File

@ -26,11 +26,12 @@ services:
-Dsolr.secureComms=none
-Dsolr.base.url=/solr
-Dindex.subsystem.name=solr6
-Dcsrf.filter.enabled=false
"
ports:
- "${symbol_dollar}{acs.port}:8080"
volumes:
- alf-acs-volume:/usr/local/tomcat/alf_data
- ${rootArtifactId}-acs-volume:/usr/local/tomcat/alf_data
depends_on:
- ${rootArtifactId}-postgres
${rootArtifactId}-postgres:
@ -42,7 +43,7 @@ services:
ports:
- "${symbol_dollar}{postgres.port}:5432"
volumes:
- alf-db-volume:/var/lib/postgresql/data
- ${rootArtifactId}-db-volume:/var/lib/postgresql/data
${rootArtifactId}-ass:
image: alfresco/alfresco-search-services:1.2.0
environment:
@ -54,12 +55,12 @@ services:
ports:
- "8983:8983"
volumes:
- alf-ass-volume:/opt/alfresco-search-services/contentstore
- alf-ass-volume:/opt/alfresco-search-services/data
- ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/contentstore
- ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/data
volumes:
alf-acs-volume:
${rootArtifactId}-acs-volume:
external: true
alf-db-volume:
${rootArtifactId}-db-volume:
external: true
alf-ass-volume:
${rootArtifactId}-ass-volume:
external: true

12
archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.bat
View File

@ -56,9 +56,9 @@ echo "Usage: %0 {build_start|start|stop|purge|tail|reload_share|build_test|test}
EXIT /B %ERRORLEVEL%
:start
docker volume create alf-acs-volume
docker volume create alf-db-volume
docker volume create alf-ass-volume
docker volume create ${rootArtifactId}-acs-volume
docker volume create ${rootArtifactId}-db-volume
docker volume create ${rootArtifactId}-ass-volume
docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d
EXIT /B 0
:start_share
@ -85,7 +85,7 @@ EXIT /B 0
call mvn verify -pl
EXIT /B 0
:purge
docker volume rm alf-acs-volume
docker volume rm alf-db-volume
docker volume rm alf-ass-volume
docker volume rm ${rootArtifactId}-acs-volume
docker volume rm ${rootArtifactId}-db-volume
docker volume rm ${rootArtifactId}-ass-volume
EXIT /B 0

12
archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.sh
View File

@ -4,9 +4,9 @@
export COMPOSE_FILE_PATH=${symbol_dollar}{PWD}/target/classes/docker/docker-compose.yml
start() {
docker volume create alf-acs-volume
docker volume create alf-db-volume
docker volume create alf-ass-volume
docker volume create ${rootArtifactId}-acs-volume
docker volume create ${rootArtifactId}-db-volume
docker volume create ${rootArtifactId}-ass-volume
docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH up --build -d
}
@ -19,9 +19,9 @@ down() {
}
purge() {
docker volume rm alf-acs-volume
docker volume rm alf-db-volume
docker volume rm alf-ass-volume
docker volume rm ${rootArtifactId}-acs-volume
docker volume rm ${rootArtifactId}-db-volume
docker volume rm ${rootArtifactId}-ass-volume
}
build() {

2
archetypes/alfresco-share-jar-archetype/src/test/resources/projects/basic/goal.txt
View File

@ -1 +1 @@
verify -Dmaven.test.skip=true
verify -DskipTests=true

1
archetypes/alfresco-share-jar-archetype/src/test/resources/projects/run-enterprise/goal.txt
View File

@ -1 +0,0 @@
install -Dalfresco.platform.version=@@alfresco.enterprise.default.version@@ -Dmaven.alfresco.edition=@@alfresco.sdk.default.edition@@

2
archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise51/archetype.properties → archetypes/alfresco-share-jar-archetype/src/test/resources/projects/runenterprise60/archetype.properties
View File

@ -1,4 +1,4 @@
version=0.1-SNAPSHOT
groupId=archetype.it
artifactId=allInOneTestRunEnterpriseFiveOne
artifactId=shareJarTestRunEnterpriseSixZero
package=it.pkg

1
archetypes/alfresco-share-jar-archetype/src/test/resources/projects/runenterprise60/goal.txt Normal file
View File

@ -0,0 +1 @@
install -DskipTests -Dalfresco.bomDependencyArtifactId="acs-packaging" -Dalfresco.platform.version="6.0.0.2" -Dalfresco.share.version="6.0" -Dalfresco.platform.docker.image="alfresco/alfresco-content-repository" -Dalfresco.share.docker.image="alfresco/alfresco-share"

2
pom.xml
View File

@ -128,7 +128,7 @@
<alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
<alfresco.platform.version>6.0.7-ga</alfresco.platform.version>
<alfresco.share.version>6.0.c</alfresco.share.version>
<alfresco.share.version>6.0.b</alfresco.share.version>
<alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
<alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>