Skip to content

Commit d38e737

Browse files
hechmi-dammak-xenithechmi-dammak-xenit
committed
XM2C-43 add share to docker alfresco
1 parent 9851f39 commit d38e737

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+990
-427
lines changed

‎1skeleton/6.1/overload.gradle ‎1alfresco-skeleton/6.1/overload.gradle

File renamed without changes.

‎1skeleton/6.2/overload.gradle ‎1alfresco-skeleton/6.2/overload.gradle

File renamed without changes.

‎1skeleton/7.0/overload.gradle ‎1alfresco-skeleton/7.0/overload.gradle

File renamed without changes.

‎1skeleton/7.1/overload.gradle ‎1alfresco-skeleton/7.1/overload.gradle

File renamed without changes.

‎1skeleton/7.2/overload.gradle ‎1alfresco-skeleton/7.2/overload.gradle

File renamed without changes.

‎1skeleton/build.gradle ‎1alfresco-skeleton/build.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,14 @@ subprojects {
3333
}
3434

3535
createDockerFile {
36+
smartCopy "${project.parent.projectDir}/src/shared/main/bash/entrypoint/docker-entrypoint.d/", '/docker-entrypoint.d/'
3637
dependsOn(tomcatImage)
3738
baseImage = tomcatImage.getImageId()
3839
volume('/opt/alfresco/alf_data')
3940
environmentVariable('ALFRESCO_VERSION', "${project.alfresco.version.major}.${project.alfresco.version.minor}.${project.alfresco.version.rev}")
4041
environmentVariable('ALFRESCO_FLAVOR', "${project.alfresco.version.flavor}")
42+
environmentVariable('ALFRESCO_ENABLED', "true")
43+
4144
}
4245

4346
// Disable pull because base image is built locally and not pushed to a repo

‎tomcat-base/src/shared/main/bash/entrypoint/docker-entrypoint.d/50-contentstore-init.sh ‎1alfresco-skeleton/src/shared/main/bash/entrypoint/docker-entrypoint.d/50-contentstore-init.sh

File renamed without changes.

‎1share-skeleton/6.1/overload.gradle

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
ext {
2+
share = [
3+
version: [
4+
major: 6,
5+
minor: 1,
6+
rev: 0
7+
],
8+
flavor: 'skeleton'
9+
]
10+
}

‎1share-skeleton/6.2/overload.gradle

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
ext {
2+
share = [
3+
version: [
4+
major: 6,
5+
minor: 2,
6+
rev: 0
7+
],
8+
flavor: 'skeleton'
9+
]
10+
}

‎1share-skeleton/7.0/overload.gradle

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
ext {
2+
share = [
3+
version: [
4+
major: 7,
5+
minor: 0,
6+
rev: 0
7+
],
8+
flavor: 'skeleton'
9+
]
10+
}

‎1share-skeleton/7.1/overload.gradle

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
ext {
2+
share = [
3+
version: [
4+
major: 7,
5+
minor: 1,
6+
rev: 0
7+
],
8+
flavor: 'skeleton'
9+
]
10+
}

‎1share-skeleton/7.2/overload.gradle

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
ext {
2+
share = [
3+
version: [
4+
major: 7,
5+
minor: 2,
6+
rev: 0
7+
],
8+
flavor: 'skeleton'
9+
]
10+
}

‎1share-skeleton/build.gradle

+99
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
subprojects {
2+
apply plugin: 'eu.xenit.docker'
3+
4+
if (new File("${project.projectDir}/overload.gradle").exists())
5+
apply from: "${project.projectDir}/overload.gradle"
6+
7+
def workingDir = "$project.buildDir/dockerbuild"
8+
9+
task copyDockerfile(type: Copy) {
10+
from("$rootProject.projectDir/src/main/resources/dockerfiles/") {
11+
include "Dockerfile-skeleton"
12+
rename "Dockerfile-skeleton", 'Dockerfile'
13+
}
14+
into workingDir
15+
}
16+
task copyGlobalResources(type: Copy) {
17+
from "$rootProject.projectDir/src/main/resources/global"
18+
into workingDir
19+
}
20+
task copyLocalResources(type: Copy) {
21+
from "$project.projectDir/local"
22+
into workingDir
23+
}
24+
25+
dockerBuild {
26+
dockerFile = file("$workingDir/Dockerfile")
27+
repositories = [calcRepository(project.share.flavor)]
28+
tags = calcTags(project.share.version)
29+
}
30+
31+
buildDockerImage {
32+
buildArgs = [
33+
'SHARE_VERSION_MAJOR': "${project.share.version.major}",
34+
'SHARE_VERSION_MINOR': "${project.share.version.minor}",
35+
'SHARE_VERSION_REV' : "${project.share.version.rev}",
36+
'SHARE_FLAVOR' : "${project.share.flavor}",
37+
'BASE_IMAGE' : "docker.io/xenit/tomcat:alfresco-${project.share.version.major}.${project.share.version.minor}-ubuntu"
38+
]
39+
40+
if (project.hasProperty('extraBuildArgs'))
41+
buildArgs.putAll(project.extraBuildArgs)
42+
43+
doFirst {
44+
println buildArgs
45+
}
46+
dependsOn(copyDockerfile)
47+
dependsOn(copyGlobalResources)
48+
dependsOn(copyLocalResources)
49+
}
50+
}
51+
52+
53+
54+
//-------------------
55+
evaluationDependsOn(':tomcat-base')
56+
57+
String getTomcatProject(Project p) {
58+
println "p.share.version.major: ${p.share.version.major}"
59+
if (p.share.version.major == 6) {
60+
println 'tomcat-8.5'
61+
return ":tomcat-base:tomcat-8.5"
62+
}
63+
64+
if (p.share.version.major == 7) {
65+
println 'tomcat-9'
66+
return ":tomcat-base:tomcat-9"
67+
}
68+
69+
return null
70+
}
71+
72+
subprojects {
73+
apply plugin: 'eu.xenit.docker'
74+
apply plugin: 'eu.xenit.docker-alfresco'
75+
apply plugin: 'eu.xenit.docker-compose'
76+
77+
if (new File("${project.projectDir}/overload.gradle").exists())
78+
apply from: "${project.projectDir}/overload.gradle"
79+
80+
def tomcatProject = project(getTomcatProject(project))
81+
def tomcatImage = tomcatProject.getTasks().getByName('buildDockerImage')
82+
println "tomcatImage: ${tomcatImage.getImageId()}"
83+
84+
dockerBuild {
85+
repositories = [calcRepository(project.share.flavor)]
86+
tags = calcTags(project.share.version)
87+
}
88+
createDockerFile {
89+
dependsOn(tomcatImage)
90+
baseImage = tomcatImage.getImageId()
91+
environmentVariable('SHARE_VERSION', "${project.share.version.major}.${project.share.version.minor}.${project.share.version.rev}")
92+
environmentVariable('SHARE_FLAVOR', "${project.share.flavor}")
93+
environmentVariable('SHARE_ENABLED', "true")
94+
}
95+
96+
97+
// Disable pull because base image is built locally and not pushed to a repo
98+
buildDockerImage.pull = false
99+
}

‎1skeleton/6.1/local/.placeholder

Whitespace-only changes.

‎1skeleton/6.2/local/.placeholder

Whitespace-only changes.

‎1skeleton/local/.placeholder

Whitespace-only changes.

‎2repository/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ subprojects {
3838
if (new File("${project.projectDir}/overload.gradle").exists())
3939
apply from: "${project.projectDir}/overload.gradle"
4040

41-
def parentProject = project(":1skeleton:${project.alfresco.version.major}" + "." + "${project.alfresco.version.minor}")
41+
def parentProject = project(":1alfresco-skeleton:${project.alfresco.version.major}" + "." + "${project.alfresco.version.minor}")
4242
def parentImage = parentProject.getTasks().getByName('buildDockerImage')
4343

4444
dockerBuild {

‎2share/6.1/community-6.1.0/overload.gradle

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
ext {
2+
share = [
3+
version: [
4+
major: 6,
5+
minor: 1,
6+
rev: '0.2'
7+
],
8+
flavor: 'community'
9+
]
10+
}
11+
12+
dependencies {
13+
baseShareWar 'org.alfresco:share:6.1.0.2@war'
14+
}
15+

‎2share/6.2/community-6.2.0/overload.gradle

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
ext {
2+
share = [
3+
version: [
4+
major: 6,
5+
minor: 2,
6+
rev: '0'
7+
],
8+
flavor: 'community'
9+
]
10+
}
11+
12+
dependencies {
13+
baseShareWar 'org.alfresco:share:6.2.0@war'
14+
}
15+

‎2share/6.2/community-6.2.2/overload.gradle

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
ext {
2+
share = [
3+
version: [
4+
major: 6,
5+
minor: 2,
6+
rev: '2'
7+
],
8+
flavor: 'community'
9+
]
10+
}
11+
12+
dependencies {
13+
baseShareWar 'org.alfresco:share:6.2.2@war'
14+
}
15+

‎2share/7.0/community-7.0.1/overload.gradle

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
ext {
2+
share = [
3+
version: [
4+
major: 7,
5+
minor: 0,
6+
rev: 1,
7+
label: 2
8+
],
9+
flavor: 'community'
10+
]
11+
}
12+
13+
dependencies {
14+
baseShareWar 'org.alfresco:share:7.0.1.2@war'
15+
}
16+

‎2share/7.1/community-7.1.0/overload.gradle

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
ext {
2+
share = [
3+
version: [
4+
major: 7,
5+
minor: 1,
6+
rev: 0
7+
],
8+
flavor: 'community'
9+
]
10+
}
11+
12+
dependencies {
13+
baseShareWar 'org.alfresco:share:14.59@war'
14+
}
15+

‎2share/7.2/community-7.2.1/overload.gradle

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
ext {
2+
share = [
3+
version: [
4+
major: 7,
5+
minor: 2,
6+
rev: 1
7+
],
8+
flavor: 'community'
9+
]
10+
}
11+
12+
dependencies {
13+
baseShareWar 'org.alfresco:share:15.2@war'
14+
}
15+

‎2share/build.gradle

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
subprojects {
2+
apply plugin: 'eu.xenit.docker-alfresco'
3+
4+
if (new File("${project.projectDir}/overload.gradle").exists())
5+
apply from: "${project.projectDir}/overload.gradle"
6+
7+
def parentProject = project(":1share-skeleton:${project.share.version.major}" + "." + "${project.share.version.minor}")
8+
def parentImage = parentProject.getTasks().getByName('buildDockerImage')
9+
10+
afterEvaluate {
11+
createDockerFile.dependsOn(parentImage)
12+
}
13+
14+
dockerBuild {
15+
repositories = [calcRepository(project.share.flavor)]
16+
tags = calcTags(project.share.version)
17+
alfresco {
18+
baseImage = parentImage.getImageId()
19+
}
20+
}
21+
22+
createDockerFile {
23+
environmentVariable('SHARE_FLAVOR', "${project.share.flavor}")
24+
environmentVariable('SHARE_VERSION', "${project.share.version.major}.${project.share.version.minor}.${project.share.version.rev}")
25+
def buildDate = project.properties.getOrDefault("buildDate", ((int) (new Date().getTime() / 1000)).toString());
26+
environmentVariable('BUILD_DATE', buildDate)
27+
}
28+
29+
createDockerFile.dependsOn(parentImage)
30+
31+
buildDockerImage {
32+
pull = false
33+
}
34+
}
35+

‎Changelog.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
1010

1111
* [PR #88](https://github.com/xenit-eu/docker-alfresco/pull/88) DOCKER-415 Add a healthcheck for Alfresco
1212
* [PR #86](https://github.com/xenit-eu/docker-alfresco/pull/86) DOCKER-414 Fix alf_data content store permissions
13-
* [PR #85](https://github.com/xenit-eu/docker-alfresco/pull/85) DOCKER-412 Add default legacy configuration for solr ssl
13+
* [PR #85](https://github.com/xenit-eu/docker-alfresco/pull/85) DOCKER-412 Add default legacy alfrescoConfiguration for solr ssl
1414
* [PR #84](https://github.com/xenit-eu/docker-alfresco/pull/82) XM2C-36: Save alfresco-global.properties to file and add to context.
1515
* [PR #82](https://github.com/xenit-eu/docker-alfresco/pull/82) DOCKER-409: Fix publishing problems, simplify the project structure.
1616
* [PR #79](https://github.com/xenit-eu/docker-alfresco/pull/79) DOCKER-405: Switch to embedded tomcat.
@@ -94,7 +94,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
9494
### Added
9595

9696
* [PR #44](https://github.com/xenit-eu/docker-alfresco/pull/44) [Issue43](https://github.com/xenit-eu/docker-alfresco/issues/43)
97-
DOCKER-341 Added configuration for custom ssl key- & truststores
97+
DOCKER-341 Added alfrescoConfiguration for custom ssl key- & truststores
9898

9999
## 2020-07.0 (2020-07-03)
100100

@@ -259,7 +259,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
259259
* [DOCKER-142] JAVA_OPTS are duplicated when starting tomcat
260260
* [DOCKER-175] Backup location for solr6
261261
* [DOCKER-145] Image of Alfresco 4.2 has MaxPermSize set, otherwise Alfresco does not start properly
262-
* [DOCKER-147] Remove client-specific share configuration
262+
* [DOCKER-147] Remove client-specific share alfrescoConfiguration
263263
* [DOCKER-178] Always do compose down to avoid dangling containers
264264

265265
### Changed

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ outstanding shares, or (iii) beneficial ownership of such entity.
2323
permissions granted by this License.
2424

2525
"Source" form shall mean the preferred form for making modifications, including
26-
but not limited to software source code, documentation source, and configuration
26+
but not limited to software source code, documentation source, and alfrescoConfiguration
2727
files.
2828

2929
"Object" form shall mean any form resulting from mechanical transformation or

0 commit comments

Comments
 (0)