Merge pull request #1443 from kauden/patch-2

sameersbn · web-flow · commit 780e8d455b06 · 2020-05-06T14:36:49.000+05:30
Accelerate map_uidgid
diff --git a/assets/runtime/functions b/assets/runtime/functions
@@ -1316,7 +1316,7 @@ map_uidgid() {
     echo "Mapping UID and GID for ${GITLAB_USER}:${GITLAB_USER} to $USERMAP_UID:$USERMAP_GID"
     groupmod -o -g ${USERMAP_GID} ${GITLAB_USER}
     sed -i -e "s|:${USERMAP_ORIG_UID}:${USERMAP_GID}:|:${USERMAP_UID}:${USERMAP_GID}:|" /etc/passwd
-    find ${GITLAB_HOME} -path ${GITLAB_DATA_DIR}/\* -prune -o -print0 | xargs -0 chown -h ${GITLAB_USER}:
+    find ${GITLAB_HOME} -path ${GITLAB_DATA_DIR}/\* \( ! -uid ${USERMAP_ORIG_UID} -o ! -gid ${USERMAP_ORIG_GID} \) -print0 | xargs -0 chown -h ${GITLAB_USER}: ${GITLAB_HOME}
   fi
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1316,7 +1316,7 @@ map_uidgid() {`
`1316`	`1316`	`echo "Mapping UID and GID for ${GITLAB_USER}:${GITLAB_USER} to $USERMAP_UID:$USERMAP_GID"`
`1317`	`1317`	`groupmod -o -g ${USERMAP_GID} ${GITLAB_USER}`
`1318`	`1318`	`sed -i -e "s\|:${USERMAP_ORIG_UID}:${USERMAP_GID}:\|:${USERMAP_UID}:${USERMAP_GID}:\|" /etc/passwd`
`1319`		`- find ${GITLAB_HOME} -path ${GITLAB_DATA_DIR}/\* -prune -o -print0 \| xargs -0 chown -h ${GITLAB_USER}:`
	`1319`	`+ find ${GITLAB_HOME} -path ${GITLAB_DATA_DIR}/\* \( ! -uid ${USERMAP_ORIG_UID} -o ! -gid ${USERMAP_ORIG_GID} \) -print0 \| xargs -0 chown -h ${GITLAB_USER}: ${GITLAB_HOME}`
`1320`	`1320`	`fi`
`1321`	`1321`	`}`
`1322`	`1322`