Skip to content

Commit f66a68b

Browse files
committed
DOCKER-464 Put the repository and tags in variables
Signed-off-by: Tim-Lukas Blom <tim-lukas.blom@xenit.eu>
1 parent de1a8df commit f66a68b

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

2repository/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,12 @@ subprojects {
3838

3939
def parentProject = project(":1alfresco-skeleton:${project.alfresco.version.major}" + "." + "${project.alfresco.version.minor}")
4040
def parentImage = parentProject.getTasks().getByName('buildDockerImage')
41+
def alfrescoRepository = calcRepository(project.alfresco.flavor,true)
42+
def alfrescoTags = calcTags(project.alfresco.version)
4143

4244
dockerBuild {
43-
repositories = [calcRepository(project.alfresco.flavor,true)]
44-
tags = calcTags(project.alfresco.version)
45+
repositories = [alfrescoRepository]
46+
tags = alfrescoTags
4547
alfresco {
4648
baseImage = parentImage.getImageId()
4749
}
@@ -79,7 +81,7 @@ subprojects {
7981
systemProperty 'alfresco.port.internal', '8080'
8082
systemProperty 'flavor', "${project.alfresco.flavor}"
8183
systemProperty 'version', "${project.alfresco.version.major}" + "." + "${project.alfresco.version.minor}"
82-
systemProperty('alfresco_image_name', "${calcRepository(project.alfresco.flavor,true)}:${calcTags(project.alfresco.version).last()}")
84+
systemProperty('alfresco_image_name', "${alfrescoRepository}:${alfrescoTags.last()}")
8385
}
8486
}
8587

0 commit comments

Comments
 (0)