add back default user

xebialabs · May 23, 2024 · 23fe2a1 · 23fe2a1
1 parent 71125c7
commit 23fe2a1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/templates/dockerfiles/central-configuration/install.j2 b/templates/dockerfiles/central-configuration/install.j2
@@ -40,11 +40,7 @@ RUN chmod +x /tmp/modify-wrapper-linux-conf.gawk && \
     rm /tmp/modify-wrapper-linux-conf.gawk
 
 # Set permissions
-{%- if target_os == "redhat" %}
-RUN groupadd -r -g 10001 xebialabs && \
-{%- else %}
-RUN addgroup -S -g 10001 xebialabs && \
-{%- endif %}
+RUN chgrp -R 0 ${APP_ROOT} && \
     chown -R 10001:10001 ${APP_ROOT} && \
     chmod -R g=u ${APP_ROOT} && \
     chmod u+x ${APP_HOME}/bin/*.sh && \

diff --git a/templates/dockerfiles/deploy-task-engine/install.j2 b/templates/dockerfiles/deploy-task-engine/install.j2
@@ -49,11 +49,7 @@ RUN mv ${APP_HOME}/plugins ${APP_HOME}/default-plugins && \
     mkdir ${APP_HOME}/repository ${APP_HOME}/export ${APP_HOME}/archive ${APP_HOME}/work ${APP_HOME}/reports
 
 # Set permissions
-{%- if target_os == "redhat" %}
-RUN groupadd -r -g 10001 xebialabs && \
-{%- else %}
-RUN addgroup -S -g 10001 xebialabs && \
-{%- endif %}
+RUN chgrp -R 0 ${APP_ROOT} && \
     chown -R 10001:10001 ${APP_ROOT} && \
     chmod -R g=u ${APP_ROOT} && \
     chmod u+x ${APP_HOME}/bin/*.sh && \

diff --git a/templates/dockerfiles/deploy-task-engine/variables.j2 b/templates/dockerfiles/deploy-task-engine/variables.j2
@@ -1,4 +1,3 @@
 # Set root folders
-ENV USER_UID=10001 \ 
-    APP_ROOT=/opt/xebialabs \
+ENV APP_ROOT=/opt/xebialabs \
     APP_HOME=/opt/xebialabs/{{ product }}
diff --git a/templates/dockerfiles/runtime.j2 b/templates/dockerfiles/runtime.j2
@@ -15,6 +15,8 @@ WORKDIR ${APP_HOME}
     {{- 'ENV ' if loop.first else '    ' -}}{{ [env['key'], env['value']]|join('=') }}{{ ' \\' if not loop.last else '' }}
 {% endfor %}
 
+USER 10001
+
 VOLUME ["{{ volumes|join('", "') }}"]
 
 EXPOSE ${APP_PORT}