From 96246586d3723afdd08b7513bd1ba59925f7268b Mon Sep 17 00:00:00 2001
From: Enis Afgan <afgane@gmail.com>
Date: Wed, 8 Jan 2025 19:09:29 -0500
Subject: [PATCH] Change galaxy system user uid for K8s image

---
 .k8s_ci.Dockerfile                                    | 2 +-
 lib/galaxy/config/sample/job_conf.xml.sample_advanced | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.k8s_ci.Dockerfile b/.k8s_ci.Dockerfile
index 287a94b94372..75e3383c56fa 100644
--- a/.k8s_ci.Dockerfile
+++ b/.k8s_ci.Dockerfile
@@ -168,7 +168,7 @@ RUN set -xe; \
 
 # Create Galaxy user, group, directory; chown
 RUN set -xe; \
-      adduser --system --group --uid 101 $GALAXY_USER \
+      adduser --system --group --uid 10001 $GALAXY_USER \
       && mkdir -p $SERVER_DIR \
       && chown $GALAXY_USER:$GALAXY_USER $ROOT_DIR -R
 
diff --git a/lib/galaxy/config/sample/job_conf.xml.sample_advanced b/lib/galaxy/config/sample/job_conf.xml.sample_advanced
index dc67a4763d74..ff84e9600b14 100644
--- a/lib/galaxy/config/sample/job_conf.xml.sample_advanced
+++ b/lib/galaxy/config/sample/job_conf.xml.sample_advanced
@@ -296,7 +296,7 @@
                     HDF5_USE_FILE_LOCKING: 'FALSE'
                     MY_OTHER_ENV_VAR: its_value
                 </param> -->
-            <!-- Sets additional environment variables (in YAML) to be passed to the k8s Jobs that handle each Galaxy job. 
+            <!-- Sets additional environment variables (in YAML) to be passed to the k8s Jobs that handle each Galaxy job.
                  This is probably possible to be set at the destination level as well, based on the source code. -->
 
             <!-- <param id="k8s_supplemental_group_id">0</param> -->
@@ -329,9 +329,9 @@
                  a requirement of the other.
 
                  -->
-            <!-- <param id="k8s_run_as_user_id">101</param> -->
+            <!-- <param id="k8s_run_as_user_id">10001</param> -->
             <!-- ID of user that should be used by the tool command in the job containers -->
-            <!-- <param id="k8s_run_as_group_id">101</param> -->
+            <!-- <param id="k8s_run_as_group_id">10001</param> -->
             <!-- ID of group that should be used by the tool command in the job containers -->
             <!-- <param id="k8s_interactivetools_use_ssl">True</param> -->
             <!-- Whether to enabled HTTPS access in the k8s ingress spec generated for each interactive tools -->
@@ -1160,7 +1160,7 @@
             <!-- `fargate_version` is required to use Fargate compute resources -->
             <param id="auto_platform">true</param>
             <!-- To let AWS Batch retry on failed jobs, set the number of attempts to 2-10 and `on_exit` conditions -->
-            <!-- 
+            <!--
             <param id="retry_attempts">2</param>
             <param id="retry_on_exit_statusReason">...</param>
             <param id="retry_on_exit_reason">...</param>