From 080f5a956c1fc0c7dd3031aed9a393fb6ba0fa75 Mon Sep 17 00:00:00 2001 From: Benjamin Van der Smissen Date: Fri, 26 Apr 2024 13:57:30 +0200 Subject: [PATCH] DOCKER-450 [Add] Support for Alfresco v23.1 && v23.2 * [Add] tomcat-embedded V10 * [TODO] Add postgres V15 --- .github/workflows/ci.yml | 4 +- 1alfresco-skeleton/23.1/overload.gradle | 11 + 1alfresco-skeleton/23.2/overload.gradle | 11 + .../23.1/local/share-config-custom.xml | 524 ++++++++++++++++++ 1share-skeleton/23.1/overload.gradle | 10 + .../23.2/local/share-config-custom.xml | 524 ++++++++++++++++++ 1share-skeleton/23.2/overload.gradle | 10 + .../23.1/community-23.1.0/overload.gradle | 24 + .../23.1/enterprise-23.1.0/overload.gradle | 23 + .../23.2/community-23.2.0/overload.gradle | 23 + .../23.2/enterprise-23.2.0/overload.gradle | 23 + 2share/23.1/community-23.1.0/overload.gradle | 17 + 2share/23.2/community-23.2.0/overload.gradle | 16 + build.gradle | 5 + settings.gradle | 21 +- .../tomcat-embedded-10/overload.gradle | 11 + 16 files changed, 1252 insertions(+), 5 deletions(-) create mode 100644 1alfresco-skeleton/23.1/overload.gradle create mode 100644 1alfresco-skeleton/23.2/overload.gradle create mode 100644 1share-skeleton/23.1/local/share-config-custom.xml create mode 100644 1share-skeleton/23.1/overload.gradle create mode 100644 1share-skeleton/23.2/local/share-config-custom.xml create mode 100644 1share-skeleton/23.2/overload.gradle create mode 100644 2repository/23.1/community-23.1.0/overload.gradle create mode 100644 2repository/23.1/enterprise-23.1.0/overload.gradle create mode 100644 2repository/23.2/community-23.2.0/overload.gradle create mode 100644 2repository/23.2/enterprise-23.2.0/overload.gradle create mode 100644 2share/23.1/community-23.1.0/overload.gradle create mode 100644 2share/23.2/community-23.2.0/overload.gradle create mode 100644 tomcat-base/tomcat-embedded-10/overload.gradle diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ffd9a0b3..3e4762ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,7 @@ jobs: strategy: fail-fast: false matrix: - version: [ "community-6.1.2-ga","community-6.2.0-ga","community-7.0.0", "community-7.1.1", "community-7.2.0", "community-7.3.0", "community-7.4.0", "enterprise-6.1.1","enterprise-6.2.2","enterprise-7.0.1", "enterprise-7.1.0", "enterprise-7.2.0", "enterprise-7.3.0", "enterprise-7.4.0" ] + version: [ "community-6.1.2-ga","community-6.2.0-ga","community-7.0.0", "community-7.1.1", "community-7.2.0", "community-7.3.0", "community-7.4.0", "community-23.1.0", "community-23.2.0", "enterprise-6.1.1","enterprise-6.2.2","enterprise-7.0.1", "enterprise-7.1.0", "enterprise-7.2.0", "enterprise-7.3.0", "enterprise-7.4.0", "enterprise-23.1.0", "enterprise-23.2.0" ] steps: - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 - name: Set up JDK 17 @@ -114,4 +114,4 @@ jobs: uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2 with: cache-read-only: false - arguments: :tomcat-base:tomcat-embedded-8.5:publish :tomcat-base:tomcat-embedded-9:publish --info -PsigningKeyId=CDE3528F \ No newline at end of file + arguments: :tomcat-base:tomcat-embedded-8.5:publish :tomcat-base:tomcat-embedded-9:publish :tomcat-base:tomcat-embedded-10:publish --info -PsigningKeyId=CDE3528F \ No newline at end of file diff --git a/1alfresco-skeleton/23.1/overload.gradle b/1alfresco-skeleton/23.1/overload.gradle new file mode 100644 index 00000000..c2773d2a --- /dev/null +++ b/1alfresco-skeleton/23.1/overload.gradle @@ -0,0 +1,11 @@ +ext { + alfresco = [ + version: [ + major: 23, + minor: 1, + rev: 0 + ], + flavor: 'skeleton' + ] +} + diff --git a/1alfresco-skeleton/23.2/overload.gradle b/1alfresco-skeleton/23.2/overload.gradle new file mode 100644 index 00000000..4b265a43 --- /dev/null +++ b/1alfresco-skeleton/23.2/overload.gradle @@ -0,0 +1,11 @@ +ext { + alfresco = [ + version: [ + major: 23, + minor: 2, + rev: 0 + ], + flavor: 'skeleton' + ] +} + diff --git a/1share-skeleton/23.1/local/share-config-custom.xml b/1share-skeleton/23.1/local/share-config-custom.xml new file mode 100644 index 00000000..3211ef8f --- /dev/null +++ b/1share-skeleton/23.1/local/share-config-custom.xml @@ -0,0 +1,524 @@ + + + + + + + false + + + false + + + + + + + + + + production + + + + + manual + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + 1000 + + + 7000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${ALFRESCO_PROTOCOL}://${ALFRESCO_HOST}:${ALFRESCO_PORT}/${ALFRESCO_CONTEXT} + + + + + false + + + + application/vnd.openxmlformats-officedocument.wordprocessingml.document + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + application/vnd.ms-powerpoint + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + location.path.documents + + slingshot/doclib/treenode/site/{site}/{container}{path}?children={evaluateChildFoldersSite}&max={maximumFolderCountSite} + + + + + + + + alfresco://company/home + + + + false + + + 500 + + + + true + + + + + + + + secret + + ALFRESCO.ORG + + HTTP/repository.server.com@ALFRESCO.ORG + + ShareHTTP + + true + + + + + + + + + + alfresco-noauth + Alfresco - unauthenticated access + Access to Alfresco Repository WebScripts that do not require authentication + alfresco + ${ALFRESCO_INTERNAL_PROTOCOL}://${ALFRESCO_INTERNAL_HOST}:${ALFRESCO_INTERNAL_PORT}/${ALFRESCO_INTERNAL_CONTEXT}/s + none + + + + alfresco + Alfresco - user access + Access to Alfresco Repository WebScripts that require user authentication + alfresco + ${ALFRESCO_INTERNAL_PROTOCOL}://${ALFRESCO_INTERNAL_HOST}:${ALFRESCO_INTERNAL_PORT}/${ALFRESCO_INTERNAL_CONTEXT}/s + user + + + + alfresco-feed + Alfresco Feed + Alfresco Feed - supports basic HTTP authentication via the EndPointProxyServlet + http + ${ALFRESCO_INTERNAL_PROTOCOL}://${ALFRESCO_INTERNAL_HOST}:${ALFRESCO_INTERNAL_PORT}/${ALFRESCO_INTERNAL_CONTEXT}/s + true + user + + + + alfresco-api + alfresco + Alfresco Public API - user access + Access to Alfresco Repository Public API that require user authentication. + This makes use of the authentication that is provided by parent 'alfresco' endpoint. + alfresco + ${ALFRESCO_INTERNAL_PROTOCOL}://${ALFRESCO_INTERNAL_HOST}:${ALFRESCO_INTERNAL_PORT}/${ALFRESCO_INTERNAL_CONTEXT}/api + user + + + + + + + + 2 + 8 + false + + + false + + + + + + + + + + + + diff --git a/1share-skeleton/23.1/overload.gradle b/1share-skeleton/23.1/overload.gradle new file mode 100644 index 00000000..00b73fe2 --- /dev/null +++ b/1share-skeleton/23.1/overload.gradle @@ -0,0 +1,10 @@ +ext { + share = [ + version: [ + major: 23, + minor: 1, + rev: 0 + ], + flavor: 'skeleton' + ] +} \ No newline at end of file diff --git a/1share-skeleton/23.2/local/share-config-custom.xml b/1share-skeleton/23.2/local/share-config-custom.xml new file mode 100644 index 00000000..3211ef8f --- /dev/null +++ b/1share-skeleton/23.2/local/share-config-custom.xml @@ -0,0 +1,524 @@ + + + + + + + false + + + false + + + + + + + + + + production + + + + + manual + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + 1000 + + + 7000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${ALFRESCO_PROTOCOL}://${ALFRESCO_HOST}:${ALFRESCO_PORT}/${ALFRESCO_CONTEXT} + + + + + false + + + + application/vnd.openxmlformats-officedocument.wordprocessingml.document + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + application/vnd.ms-powerpoint + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + location.path.documents + + slingshot/doclib/treenode/site/{site}/{container}{path}?children={evaluateChildFoldersSite}&max={maximumFolderCountSite} + + + + + + + + alfresco://company/home + + + + false + + + 500 + + + + true + + + + + + + + secret + + ALFRESCO.ORG + + HTTP/repository.server.com@ALFRESCO.ORG + + ShareHTTP + + true + + + + + + + + + + alfresco-noauth + Alfresco - unauthenticated access + Access to Alfresco Repository WebScripts that do not require authentication + alfresco + ${ALFRESCO_INTERNAL_PROTOCOL}://${ALFRESCO_INTERNAL_HOST}:${ALFRESCO_INTERNAL_PORT}/${ALFRESCO_INTERNAL_CONTEXT}/s + none + + + + alfresco + Alfresco - user access + Access to Alfresco Repository WebScripts that require user authentication + alfresco + ${ALFRESCO_INTERNAL_PROTOCOL}://${ALFRESCO_INTERNAL_HOST}:${ALFRESCO_INTERNAL_PORT}/${ALFRESCO_INTERNAL_CONTEXT}/s + user + + + + alfresco-feed + Alfresco Feed + Alfresco Feed - supports basic HTTP authentication via the EndPointProxyServlet + http + ${ALFRESCO_INTERNAL_PROTOCOL}://${ALFRESCO_INTERNAL_HOST}:${ALFRESCO_INTERNAL_PORT}/${ALFRESCO_INTERNAL_CONTEXT}/s + true + user + + + + alfresco-api + alfresco + Alfresco Public API - user access + Access to Alfresco Repository Public API that require user authentication. + This makes use of the authentication that is provided by parent 'alfresco' endpoint. + alfresco + ${ALFRESCO_INTERNAL_PROTOCOL}://${ALFRESCO_INTERNAL_HOST}:${ALFRESCO_INTERNAL_PORT}/${ALFRESCO_INTERNAL_CONTEXT}/api + user + + + + + + + + 2 + 8 + false + + + false + + + + + + + + + + + + diff --git a/1share-skeleton/23.2/overload.gradle b/1share-skeleton/23.2/overload.gradle new file mode 100644 index 00000000..7f8e04a6 --- /dev/null +++ b/1share-skeleton/23.2/overload.gradle @@ -0,0 +1,10 @@ +ext { + share = [ + version: [ + major: 23, + minor: 2, + rev: 0 + ], + flavor: 'skeleton' + ] +} \ No newline at end of file diff --git a/2repository/23.1/community-23.1.0/overload.gradle b/2repository/23.1/community-23.1.0/overload.gradle new file mode 100644 index 00000000..1011ea20 --- /dev/null +++ b/2repository/23.1/community-23.1.0/overload.gradle @@ -0,0 +1,24 @@ +ext { + alfresco = [ + version: [ + major: 23, + minor: 1, + rev : 0, + label: 1 + ], + flavor : 'community' + ] + solrimage = 'docker.io/xenit/alfresco-solr6:2.0.8.2' + shareimage = 'docker.io/xenit/alfresco-share-community:23.1.0' +// 13,14,15 are supported + psqlimage = 'docker.io/xenit/postgres:13' + tests = true + alfrescoBomVersion='23.1.0' +} + +dependencies { + alfrescoAmp platform("org.alfresco:acs-community-packaging:$alfrescoBomVersion") + alfrescoAmp 'org.alfresco:alfresco-share-services@amp' + baseAlfrescoWar platform("org.alfresco:acs-community-packaging:$alfrescoBomVersion") + baseAlfrescoWar 'org.alfresco:content-services-community@war' +} diff --git a/2repository/23.1/enterprise-23.1.0/overload.gradle b/2repository/23.1/enterprise-23.1.0/overload.gradle new file mode 100644 index 00000000..4dd0d7d6 --- /dev/null +++ b/2repository/23.1/enterprise-23.1.0/overload.gradle @@ -0,0 +1,23 @@ +ext { + alfresco = [ + version: [ + major: 23, + minor: 1, + rev : 0, + label: 1 + ], + flavor : 'enterprise' + ] + solrimage = 'docker.io/xenit/alfresco-solr6:2.0.8.2' + shareimage = 'docker.io/xenit/alfresco-share-community:23.1.0' + psqlimage = 'docker.io/xenit/postgres:13' + tests = true + alfrescoBomVersion = '23.1.0' +} + +dependencies { + alfrescoAmp platform("org.alfresco:acs-packaging:$alfrescoBomVersion") + alfrescoAmp 'org.alfresco:alfresco-share-services@amp' + baseAlfrescoWar platform("org.alfresco:acs-packaging:$alfrescoBomVersion") + baseAlfrescoWar 'org.alfresco:content-services@war' +} diff --git a/2repository/23.2/community-23.2.0/overload.gradle b/2repository/23.2/community-23.2.0/overload.gradle new file mode 100644 index 00000000..d3221184 --- /dev/null +++ b/2repository/23.2/community-23.2.0/overload.gradle @@ -0,0 +1,23 @@ +ext { + alfresco = [ + version: [ + major: 23, + minor: 2, + rev : 0, + label: 1 + ], + flavor : 'community' + ] + solrimage = 'docker.io/xenit/alfresco-solr6:2.0.8.2' + shareimage = 'docker.io/xenit/alfresco-share-community:23.2.0' + psqlimage = 'docker.io/xenit/postgres:13' + tests = true + alfrescoBomVersion='23.2.0' +} + +dependencies { + alfrescoAmp platform("org.alfresco:acs-community-packaging:$alfrescoBomVersion") + alfrescoAmp 'org.alfresco:alfresco-share-services@amp' + baseAlfrescoWar platform("org.alfresco:acs-community-packaging:$alfrescoBomVersion") + baseAlfrescoWar 'org.alfresco:content-services-community@war' +} diff --git a/2repository/23.2/enterprise-23.2.0/overload.gradle b/2repository/23.2/enterprise-23.2.0/overload.gradle new file mode 100644 index 00000000..516d4ed7 --- /dev/null +++ b/2repository/23.2/enterprise-23.2.0/overload.gradle @@ -0,0 +1,23 @@ +ext { + alfresco = [ + version: [ + major: 23, + minor: 2, + rev : 0, + label: 1 + ], + flavor : 'enterprise' + ] + solrimage = 'docker.io/xenit/alfresco-solr6:2.0.8.2' + shareimage = 'docker.io/xenit/alfresco-share-community:23.2.0' + psqlimage = 'docker.io/xenit/postgres:13' + tests = true + alfrescoBomVersion = '23.2.0' +} + +dependencies { + alfrescoAmp platform("org.alfresco:acs-packaging:$alfrescoBomVersion") + alfrescoAmp 'org.alfresco:alfresco-share-services@amp' + baseAlfrescoWar platform("org.alfresco:acs-packaging:$alfrescoBomVersion") + baseAlfrescoWar 'org.alfresco:content-services@war' +} diff --git a/2share/23.1/community-23.1.0/overload.gradle b/2share/23.1/community-23.1.0/overload.gradle new file mode 100644 index 00000000..7d3753e2 --- /dev/null +++ b/2share/23.1/community-23.1.0/overload.gradle @@ -0,0 +1,17 @@ +ext { + share = [ + version: [ + major: 23, + minor: 1, + rev: 0, + label: 1 + ], + flavor: 'community' + ] +} + +dependencies { + baseShareWar 'org.alfresco:share:23.1.1.2@war' +// baseShareWar 'org.alfresco:share:23.2.0.72@war' +} + diff --git a/2share/23.2/community-23.2.0/overload.gradle b/2share/23.2/community-23.2.0/overload.gradle new file mode 100644 index 00000000..7e78ef01 --- /dev/null +++ b/2share/23.2/community-23.2.0/overload.gradle @@ -0,0 +1,16 @@ +ext { + share = [ + version: [ + major: 23, + minor: 2, + rev: 0, + label: 1 + ], + flavor: 'community' + ] +} + +dependencies { + baseShareWar 'org.alfresco:share:23.2.0.72@war' +} + diff --git a/build.gradle b/build.gradle index bf2e457c..c86c1f3d 100644 --- a/build.gradle +++ b/build.gradle @@ -65,6 +65,11 @@ String getTomcatProject(majorVersion) { return ":tomcat-base:tomcat-embedded-9" } + if (majorVersion == 23) { + println 'tomcat-embedded-10' + return ":tomcat-base:tomcat-embedded-10" + } + return null } diff --git a/settings.gradle b/settings.gradle index 17a20bf2..e9ee08d7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,8 +1,8 @@ rootProject.name = 'docker-alfresco' - include ':tomcat-base' include ':tomcat-base:tomcat-embedded-8.5' include ':tomcat-base:tomcat-embedded-9' +include ':tomcat-base:tomcat-embedded-10' include ':1alfresco-skeleton' include ':1alfresco-skeleton:6.1' include ':1alfresco-skeleton:6.2' @@ -11,6 +11,8 @@ include ':1alfresco-skeleton:7.1' include ':1alfresco-skeleton:7.2' include ':1alfresco-skeleton:7.3' include ':1alfresco-skeleton:7.4' +include ':1alfresco-skeleton:23.1' +include ':1alfresco-skeleton:23.2' include ':2repository' include ':1share-skeleton' include ':1share-skeleton:6.1' @@ -20,19 +22,26 @@ include ':1share-skeleton:7.1' include ':1share-skeleton:7.2' include ':1share-skeleton:7.3' include ':1share-skeleton:7.4' +include ':1share-skeleton:23.1' +include ':1share-skeleton:23.2' include ':2share' def includeRepoProject(String flavor, String version) { def projectName = ":2repository:${flavor}-$version" include projectName - project(projectName).projectDir = file("2repository/${version.substring(0,3)}/${flavor}-$version") + project(projectName).projectDir = file("2repository/${version.substring(0,getSecondDotPosition(version))}/${flavor}-$version") } def includeShareProject(String flavor, String version) { def projectName = ":2share:${flavor}-$version" include projectName - project(projectName).projectDir = file("2share/${version.substring(0,3)}/${flavor}-$version") + project(projectName).projectDir = file("2share/${version.substring(0,getSecondDotPosition(version))}/${flavor}-$version") +} + +def getSecondDotPosition(String version) { + return version.split(/\./)[0].length() + 1 + version.split(/\./)[1].length() } + if (includeCommunity == 'true') { includeRepoProject('community', '6.1.2-ga') includeRepoProject('community', '6.2.0-ga') @@ -41,6 +50,8 @@ if (includeCommunity == 'true') { includeRepoProject('community', '7.2.0') includeRepoProject('community', '7.3.0') includeRepoProject('community', '7.4.0') + includeRepoProject('community', '23.1.0') + includeRepoProject('community', '23.2.0') includeShareProject('community', '6.1.0') includeShareProject('community', '6.2.2') @@ -49,6 +60,8 @@ if (includeCommunity == 'true') { includeShareProject('community', '7.2.1') includeShareProject('community', '7.3.0') includeShareProject('community', '7.4.0') + includeShareProject('community', '23.1.0') + includeShareProject('community', '23.2.0') } if (includeEnterprise == 'true') { @@ -59,4 +72,6 @@ if (includeEnterprise == 'true') { includeRepoProject('enterprise', '7.2.0') includeRepoProject('enterprise', '7.3.0') includeRepoProject('enterprise', '7.4.0') + includeRepoProject('enterprise', '23.1.0') + includeRepoProject('enterprise', '23.2.0') } diff --git a/tomcat-base/tomcat-embedded-10/overload.gradle b/tomcat-base/tomcat-embedded-10/overload.gradle new file mode 100644 index 00000000..98760529 --- /dev/null +++ b/tomcat-base/tomcat-embedded-10/overload.gradle @@ -0,0 +1,11 @@ +ext { + tomcat = [ + version: '10.0.27' + ] +} + +sonarqube { + properties { + property 'sonar.projectBaseDir', "$project.parent.projectDir/src/shared/" + } +} \ No newline at end of file