Use a variable to set the user in the Dockerfile

This commit is contained in:
gfertuso
2021-09-20 12:24:47 +01:00
parent a00e6e5645
commit dd883b7d4a
6 changed files with 16 additions and 2 deletions

View File

@@ -1,7 +1,7 @@
FROM ${docker.acs.image}:${alfresco.platform.version} FROM ${docker.acs.image}:${alfresco.platform.version}
ARG TOMCAT_DIR=/usr/local/tomcat ARG TOMCAT_DIR=/usr/local/tomcat
ARG USERNAME=alfresco ARG USERNAME=${alfresco.platform.docker.user}
USER root USER root

View File

@@ -23,6 +23,7 @@
<alfresco.groupId>org.alfresco</alfresco.groupId> <alfresco.groupId>org.alfresco</alfresco.groupId>
<alfresco.bomDependencyArtifactId>@@alfresco.bomDependency.artifactId@@</alfresco.bomDependencyArtifactId> <alfresco.bomDependencyArtifactId>@@alfresco.bomDependency.artifactId@@</alfresco.bomDependencyArtifactId>
<alfresco.platform.version>@@alfresco.platform.version@@</alfresco.platform.version> <alfresco.platform.version>@@alfresco.platform.version@@</alfresco.platform.version>
<alfresco.platform.docker.user>@@alfresco.platform.docker.user@@</alfresco.platform.docker.user>
<alfresco.share.version>@@alfresco.share.version@@</alfresco.share.version> <alfresco.share.version>@@alfresco.share.version@@</alfresco.share.version>
<alfresco.share.docker.version>@@alfresco.share.docker.version@@</alfresco.share.docker.version> <alfresco.share.docker.version>@@alfresco.share.docker.version@@</alfresco.share.docker.version>

View File

@@ -19,6 +19,7 @@
<alfresco.groupId>org.alfresco</alfresco.groupId> <alfresco.groupId>org.alfresco</alfresco.groupId>
<alfresco.bomDependencyArtifactId>@@alfresco.bomDependency.artifactId@@</alfresco.bomDependencyArtifactId> <alfresco.bomDependencyArtifactId>@@alfresco.bomDependency.artifactId@@</alfresco.bomDependencyArtifactId>
<alfresco.platform.version>@@alfresco.platform.version@@</alfresco.platform.version> <alfresco.platform.version>@@alfresco.platform.version@@</alfresco.platform.version>
<alfresco.platform.docker.user>@@alfresco.platform.docker.user@@</alfresco.platform.docker.user>
<alfresco.share.version>@@alfresco.share.version@@</alfresco.share.version> <alfresco.share.version>@@alfresco.share.version@@</alfresco.share.version>
<alfresco.share.docker.version>@@alfresco.share.docker.version@@</alfresco.share.docker.version> <alfresco.share.docker.version>@@alfresco.share.docker.version@@</alfresco.share.docker.version>

View File

@@ -1,7 +1,7 @@
FROM ${docker.acs.image}:${alfresco.platform.version} FROM ${docker.acs.image}:${alfresco.platform.version}
ARG TOMCAT_DIR=/usr/local/tomcat ARG TOMCAT_DIR=/usr/local/tomcat
ARG USERNAME=alfresco ARG USERNAME=${alfresco.platform.docker.user}
USER root USER root

View File

@@ -19,6 +19,7 @@
<alfresco.groupId>org.alfresco</alfresco.groupId> <alfresco.groupId>org.alfresco</alfresco.groupId>
<alfresco.bomDependencyArtifactId>@@alfresco.bomDependency.artifactId@@</alfresco.bomDependencyArtifactId> <alfresco.bomDependencyArtifactId>@@alfresco.bomDependency.artifactId@@</alfresco.bomDependencyArtifactId>
<alfresco.platform.version>@@alfresco.platform.version@@</alfresco.platform.version> <alfresco.platform.version>@@alfresco.platform.version@@</alfresco.platform.version>
<alfresco.platform.docker.user>@@alfresco.platform.docker.user@@</alfresco.platform.docker.user>
<alfresco.share.version>@@alfresco.share.version@@</alfresco.share.version> <alfresco.share.version>@@alfresco.share.version@@</alfresco.share.version>
<alfresco.share.docker.version>@@alfresco.share.docker.version@@</alfresco.share.docker.version> <alfresco.share.docker.version>@@alfresco.share.docker.version@@</alfresco.share.docker.version>

11
pom.xml
View File

@@ -57,6 +57,7 @@
<alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId> <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
<alfresco.platform.version>7.1.0-A14</alfresco.platform.version> <alfresco.platform.version>7.1.0-A14</alfresco.platform.version>
<alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
<alfresco.share.docker.version>7.1.0-M1</alfresco.share.docker.version> <alfresco.share.docker.version>7.1.0-M1</alfresco.share.docker.version>
<!-- The following value is obtained by looking at the Share Services version <!-- The following value is obtained by looking at the Share Services version
for the GitHub Tag related to the above Docker version, for example: for the GitHub Tag related to the above Docker version, for example:
@@ -107,6 +108,7 @@
<alfresco.share.version>6.0.b</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.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
<alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image> <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
<alfresco.platform.docker.user>root</alfresco.platform.docker.user>
<keystore.settings /> <keystore.settings />
</properties> </properties>
</profile> </profile>
@@ -120,6 +122,7 @@
<alfresco.share.version>6.0</alfresco.share.version> <alfresco.share.version>6.0</alfresco.share.version>
<alfresco.platform.docker.image>alfresco/alfresco-content-repository</alfresco.platform.docker.image> <alfresco.platform.docker.image>alfresco/alfresco-content-repository</alfresco.platform.docker.image>
<alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image> <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
<alfresco.platform.docker.user>root</alfresco.platform.docker.user>
<keystore.settings /> <keystore.settings />
</properties> </properties>
</profile> </profile>
@@ -135,6 +138,7 @@
<alfresco.share.version>6.1.1</alfresco.share.version> <alfresco.share.version>6.1.1</alfresco.share.version>
<alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image> <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
<alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image> <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
<alfresco.platform.docker.user>root</alfresco.platform.docker.user>
<keystore.settings /> <keystore.settings />
</properties> </properties>
</profile> </profile>
@@ -147,6 +151,7 @@
<alfresco.share.version>6.1.1.3</alfresco.share.version> <alfresco.share.version>6.1.1.3</alfresco.share.version>
<alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image> <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
<alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image> <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
<alfresco.platform.docker.user>root</alfresco.platform.docker.user>
<keystore.settings /> <keystore.settings />
</properties> </properties>
</profile> </profile>
@@ -161,6 +166,7 @@
<alfresco.share.version>6.2.2.5</alfresco.share.version> <alfresco.share.version>6.2.2.5</alfresco.share.version>
<alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image> <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
<alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image> <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
<alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
<keystore.settings /> <keystore.settings />
</properties> </properties>
</profile> </profile>
@@ -173,6 +179,7 @@
<alfresco.share.version>6.2.2.5</alfresco.share.version> <alfresco.share.version>6.2.2.5</alfresco.share.version>
<alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image> <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
<alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image> <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
<alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
<keystore.settings /> <keystore.settings />
</properties> </properties>
</profile> </profile>
@@ -187,6 +194,7 @@
<alfresco.share.version>7.0.0.3</alfresco.share.version> <alfresco.share.version>7.0.0.3</alfresco.share.version>
<alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image> <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
<alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image> <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
<alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
</properties> </properties>
</profile> </profile>
<profile> <profile>
@@ -198,6 +206,7 @@
<alfresco.share.version>7.0.0.3</alfresco.share.version> <alfresco.share.version>7.0.0.3</alfresco.share.version>
<alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image> <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
<alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image> <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
<alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
</properties> </properties>
</profile> </profile>
@@ -211,6 +220,7 @@
<alfresco.share.version>7.0.0.3</alfresco.share.version> <alfresco.share.version>7.0.0.3</alfresco.share.version>
<alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image> <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
<alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image> <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
<alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
</properties> </properties>
</profile> </profile>
<profile> <profile>
@@ -222,6 +232,7 @@
<alfresco.share.docker.version>7.1.0-A14</alfresco.share.docker.version> <alfresco.share.docker.version>7.1.0-A14</alfresco.share.docker.version>
<alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image> <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
<alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image> <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
<alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
</properties> </properties>
</profile> </profile>