S-109086 installation without root user (#226)

* D-34407 type-default.properties are not synced from the central-conf * D-34407 type-default.properties are not synced from the central-conf * S-109086 installation without root user --------- Co-authored-by: Vedran Pugar <[email protected]>
xebialabs · Jun 1, 2024 · c0cf1a7 · c0cf1a7
1 parent 5369e59
commit c0cf1a7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/templates/dockerfiles/central-configuration/install.j2 b/templates/dockerfiles/central-configuration/install.j2
@@ -42,6 +42,5 @@ RUN chmod +x /tmp/modify-wrapper-linux-conf.gawk && \
 # Set permissions
 RUN chgrp -R 0 ${APP_ROOT} && \
     chmod -R g=u ${APP_ROOT} && \
-    chmod u+x ${APP_HOME}/bin/*.sh && \
-    chmod g+x ${APP_HOME}/bin/*.sh && \
+    chmod ugo+x ${APP_HOME}/bin/*.sh && \
     chmod a+rwx ${APP_HOME}/centralConfiguration
diff --git a/templates/dockerfiles/deploy-task-engine/install.j2 b/templates/dockerfiles/deploy-task-engine/install.j2
@@ -51,5 +51,4 @@ RUN mv ${APP_HOME}/plugins ${APP_HOME}/default-plugins && \
 # Set permissions
 RUN chgrp -R 0 ${APP_ROOT} && \
     chmod -R g=u ${APP_ROOT} && \
-    chmod u+x ${APP_HOME}/bin/*.sh && \
-    chmod g+x ${APP_HOME}/bin/*.sh
+    chmod ugo+x ${APP_HOME}/bin/*.sh
diff --git a/templates/dockerfiles/install.j2 b/templates/dockerfiles/install.j2
@@ -75,5 +75,4 @@ RUN mv ${APP_HOME}/plugins ${APP_HOME}/default-plugins && \
 # Set permissions
 RUN chgrp -R 0 ${APP_ROOT} && \
     chmod -R g=u ${APP_ROOT} && \
-    chmod u+x ${APP_HOME}/bin/*.sh && \
-    chmod g+x ${APP_HOME}/bin/*.sh
+    chmod ugo+x ${APP_HOME}/bin/*.sh
diff --git a/templates/dockerfiles/runtime.j2 b/templates/dockerfiles/runtime.j2
@@ -7,7 +7,7 @@ RUN chmod ugo+x ${APP_ROOT}/tini
 
 # Add xebialabs user but do not switch to it
 RUN groupadd -r -g 10001 xebialabs && \
-    useradd -r -u 10001 -g xebialabs xebialabs
+    useradd -r -u 10001 -g 0 -G xebialabs xebialabs
 
 WORKDIR ${APP_HOME}