move chmod block

Author: bdevcich

ssh-container/Dockerfile

@@ -1,8 +1,8 @@
 FROM ghcr.io/nearnodeflash/nnf-dm-copy-offload:0.1.19
 
 # Build arguments for user UID/GID
-ARG USER_UID=1060
-ARG USER_GID=100
+ARG USER_UID=1234
+ARG USER_GID=1234
 
 # Set environment variables
 ENV USER_UID=${USER_UID}
@@ -38,13 +38,6 @@ RUN cat ${KEYS_DIR}mpiuser_key.pub > ${KEYS_DIR}/authorized_keys
 # Override any entrypoint from base image and set our own
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod a+x /entrypoint.sh
-
-# Set proper permissions on keys
-RUN chmod 600 ${KEYS_DIR}/ssh_host_rsa_key && \
-    chmod 644 ${KEYS_DIR}/ssh_host_rsa_key.pub && \
-    chmod 600 ${KEYS_DIR}/authorized_keys && \
-    chmod 700 /home/mpiuser/.ssh && \
-    chown -R ${USER_UID}:${USER_GID} /home/mpiuser
 
 # USER mpiuser
 WORKDIR /home/mpiuser
@@ -55,6 +48,13 @@ RUN echo "HostKey $KEYS_DIR/ssh_host_rsa_key" > "$SESSION_DIR/sshd_config" && \
     echo "PermitRootLogin no" >> "$SESSION_DIR/sshd_config" && \
     echo "PasswordAuthentication no" >> "$SESSION_DIR/sshd_config"
 
+# Set proper permissions on keys
+RUN chmod 600 ${KEYS_DIR}/ssh_host_rsa_key && \
+    chmod 644 ${KEYS_DIR}/ssh_host_rsa_key.pub && \
+    chmod 600 ${KEYS_DIR}/authorized_keys && \
+    chmod 700 /home/mpiuser/.ssh && \
+    chown -R ${USER_UID}:${USER_GID} /home/mpiuser
+
 # Labels for identifying the UID/GID
 LABEL uid="${USER_UID}"
 LABEL gid="${USER_GID}"

ssh-container/entrypoint.sh

@@ -1,5 +1,10 @@
 #!/bin/sh 
 
+echo "Starting SSH container entrypoint script..."
+
+whoami
+id
+
 ls -la /home/mpiuser
 ls -la /home/mpiuser/ssh-session