[docker] Allow non-unique GID (#15699)

* Allow non-unique GID

* update CI

* Update context path

* Update dependencies

docker/Dockerfile.dockerignore → .dockerignore

@@ -40,3 +40,4 @@ tests/**/coverage
 tests/**/.cache-loader
 
 **/node_modules
+.yarn

.github/workflows/docker-test.yml

@@ -3,10 +3,15 @@ name: Docker Tests
 on:
   schedule:
     - cron: '0 0 * * *'
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
 
 jobs:
   docker:
     name: Docker Dev Container
+    if: ${{ github.event_name == 'schedule' }} || contains( github.event.pull_request.title, '[docker]')
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout

docker/Dockerfile

@@ -1,41 +1,40 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-FROM mambaorg/micromamba:latest
+FROM --platform=linux/amd64 mambaorg/micromamba:1.5.5-jammy
 
 # Create new user
 ARG NEW_MAMBA_USER_ID=57440
 ARG NEW_MAMBA_USER_GID=57440
-ARG NEW_MAMBA_USER=labdev
+
 
 USER root
 
 RUN if grep -q '^ID=alpine$' /etc/os-release; then \
-      # alpine does not have usermod/groupmod
-      apk add --no-cache --virtual temp-packages shadow=4.13-r0; \
-    fi && \
-    usermod "--login=${NEW_MAMBA_USER}" "--home=/home/${NEW_MAMBA_USER}" \
-        --move-home "-u ${NEW_MAMBA_USER_ID}" "${MAMBA_USER}" && \
-    groupmod "--new-name=${NEW_MAMBA_USER}" \
-        "-g ${NEW_MAMBA_USER_GID}" "${MAMBA_USER}" && \
-    if grep -q '^ID=alpine$' /etc/os-release; then \
-      # remove the packages that were only needed for usermod/groupmod
-      apk del temp-packages; \
-    fi && \
-    # Update the expected value of MAMBA_USER for the
-    # _entrypoint.sh consistency check.
-    echo "${NEW_MAMBA_USER}" > "/etc/arg_mamba_user" && \
-    :
-ENV MAMBA_USER=$NEW_MAMBA_USER
+  # alpine does not have usermod/groupmod
+  apk add --no-cache --virtual temp-packages shadow=4.13-r0; \
+  fi
+RUN if [ "$(id ${MAMBA_USER} -u)" != "$NEW_MAMBA_USER_ID" ]; then \
+  usermod "-u ${NEW_MAMBA_USER_ID}" "${MAMBA_USER}"; \
+  fi
+RUN if [ "$(id ${MAMBA_USER} -g)" != "$NEW_MAMBA_USER_GID" ]; then \
+  groupmod -o -g ${NEW_MAMBA_USER_GID} ${MAMBA_USER} && \
+  usermod -g ${NEW_MAMBA_USER_GID} ${MAMBA_USER}; \
+  fi
+RUN if grep -q '^ID=alpine$' /etc/os-release; then \
+  # remove the packages that were only needed for usermod/groupmod
+  apk del temp-packages; \
+  fi
+
 USER $MAMBA_USER
 
 WORKDIR /home/$MAMBA_USER/jupyterlab_cache
 
-COPY --chown=$MAMBA_USER:$MAMBA_USER ../binder/environment.yml ./binder/environment.yml
+COPY --chown=$MAMBA_USER:$MAMBA_USER docker/environment.yml ./docker/environment.yml
 
-RUN  micromamba install -n base -c conda-forge git rsync -y && micromamba install -y -n base -f ./binder/environment.yml && micromamba clean --all --yes
+RUN  micromamba install -n base -c conda-forge git rsync -y && micromamba install -y -n base -f ./docker/environment.yml && micromamba clean --all --yes
 
-COPY --chown=$MAMBA_USER:$MAMBA_USER .. .
+COPY --chown=$MAMBA_USER:$MAMBA_USER . .
 
 RUN micromamba run jlpm install
 

docker/environment.yml

@@ -0,0 +1,17 @@
+name: base
+
+channels:
+  - conda-forge
+  - nodefaults
+
+dependencies:
+  # runtimes
+  - nodejs ==20.1
+  - python =3.11
+  # package managers
+  - pip
+  - yarn >=3,<4
+  # build
+  - hatch-jupyter-builder >=0.3.2
+  - hatchling >=1.5.0
+  - jupyterlab >=4,<5

docker/start.sh

@@ -8,8 +8,9 @@ set -o pipefail
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 ROOT_DIR=$(dirname $SCRIPT_DIR)
 
-DEV_USER="labdev"
+DEV_USER="mambauser"
 GID=$(id -g)
+USER_ID=$(id -u)
 RSYNC_CMD="rsync -ar /home/$DEV_USER/jupyterlab_cache/node_modules/. /home/$DEV_USER/jupyterlab/node_modules"
 CMD=$1 # possible command: build, clean, dev, shell
 
@@ -34,7 +35,7 @@ IMAGE_TAG="jupyterlab_dev:$ROOT_DIR_MD5"
 DEV_CONTAINER="jupyterlab_dev_container_$ROOT_DIR_MD5"
 
 build_image () {
-    docker build  --build-arg NEW_MAMBA_USER_ID=$UID --build-arg NEW_MAMBA_USER_GID=$GID $ROOT_DIR -f $SCRIPT_DIR/Dockerfile -t $IMAGE_TAG
+    docker build  --build-arg NEW_MAMBA_USER_ID=$USER_ID --build-arg NEW_MAMBA_USER_GID=$GID $ROOT_DIR -f $SCRIPT_DIR/Dockerfile -t $IMAGE_TAG
 }
 
 stop_contaniner () {
@@ -68,5 +69,5 @@ if [[ $CMD == 'build' ]]; then
     if [[ $CMD == 'dev-detach' ]]; then
         RUN_MODE="-d"
     fi
-    docker run $RUN_MODE --name $DEV_CONTAINER --rm -p $PORT:$PORT -v $ROOT_DIR:/home/$DEV_USER/jupyterlab --entrypoint "/bin/bash" $IMAGE_TAG -i -c "$DOCKER_CMD"
+    docker run $RUN_MODE --user $USER_ID:$GID --name $DEV_CONTAINER --rm -p $PORT:$PORT -v $ROOT_DIR:/home/$DEV_USER/jupyterlab --entrypoint "/bin/bash" $IMAGE_TAG -i -c "$DOCKER_CMD"
 fi