Merge branch 'ddl-ebrown.DOM-46168-check-for-group'

* ddl-ebrown.DOM-46168-check-for-group:
  Add docker-build-mpi Makefile target
  [DOM-46168] Fix MPI script when gid 12574 exists

Makefile

@@ -6,6 +6,8 @@ SHELL := /bin/bash
 
 # Image URL to use all building/pushing image targets
 IMG ?= ghcr.io/dominodatalab/distributed-compute-operator:latest
+MPI_INIT_IMG ?= quay.io/domino/distributed-compute-operator-mpi-init:latest
+MPI_SYNC_IMG ?= quay.io/domino/distributed-compute-operator-mpi-sync:latest
 # Produce CRDs that work with Kubernetes 1.16+ and supports defaulting, api
 # version conversion, and field pruning.
 CRD_OPTIONS ?= "crd:crdVersions=v1,maxDescLen=100"
@@ -63,6 +65,10 @@ build: generate fmt ## Build manager binary.
 run: manifests generate fmt ## Run a controller from your host.
 	go run ./main.go start
 
+docker-build-mpi:
+	docker build -t $(MPI_INIT_IMG) ./dockerfiles --file ./dockerfiles/mpi-init.Dockerfile
+	docker build -t $(MPI_SYNC_IMG) ./dockerfiles --file ./dockerfiles/mpi-sync.Dockerfile
+
 docker-build: ## Build docker image with the manager.
 	docker build -t ${IMG} .
 

dockerfiles/mpi-worker-start.sh

@@ -20,17 +20,23 @@ fi
 if ! id $DOMINO_UID >/dev/null 2>&1; then
 	useradd -u $DOMINO_UID -g $DOMINO_GID -mN -s /bin/bash -d "$DOMINO_HOME_DIR" $DOMINO_USER
 else
-    # Change username of user with matching userid if needed
+	# Change username of user with matching userid if needed
 	EXISTING_USER=$(id -nu $DOMINO_UID)
 	if [ "$EXISTING_USER" != "$DOMINO_USER" ]; then
 		usermod -l $DOMINO_USER $EXISTING_USER
 	fi
 
+	# Change groupname of group with matching groupid if needed
+	EXISTING_GROUP=$(id -ng $DOMINO_GID)
+	if [ "$EXISTING_GROUP" != "$DOMINO_GROUP" ]; then
+		groupmod --new-name $DOMINO_GROUP $EXISTING_GROUP
+	fi
+
 	# Change home directory (idempotent)
 	usermod -d "$DOMINO_HOME_DIR" $DOMINO_USER
 
-    # Add to domino group (idempotent)
-    usermod -a -G $DOMINO_GROUP $DOMINO_USER
+	# Add to domino group (idempotent)
+	usermod -a -G $DOMINO_GROUP $DOMINO_USER
 fi
 
 
@@ -81,4 +87,4 @@ AllowUsers $DOMINO_USER
 EOF
 chmod 444 "$CONFIG_DIR/sshd_config"
 
-su -c "$INSTALL_DIR/sbin/sshd -f \"$CONFIG_DIR/sshd_config\" -De" - $DOMINO_USER 
+su -c "$INSTALL_DIR/sbin/sshd -f \"$CONFIG_DIR/sshd_config\" -De" - $DOMINO_USER