Merge pull request #12 from joyeecheung/fix-dockerfile

fix: fix Dockerfile

Author: joyeecheung

Dockerfile

@@ -1,12 +1,30 @@
 FROM ubuntu:latest AS build
 
-RUN groupadd --gid 1000 developer \
-  && useradd --uid 1000 --gid developer --shell /bin/bash --create-home developer
+ARG USER_UID=900
+ARG USER_GID=$USER_UID
+
+# Create the non-root user and grant NOPASSWD sudo
+RUN groupadd --gid $USER_GID developer
+RUN useradd --uid $USER_UID --gid $USER_GID --shell /bin/bash --create-home developer
+
+# Install sudo first
+RUN apt-get update
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends sudo
+
+# No Sudo Prompt - thanks Electron for this
+RUN echo 'developer ALL=NOPASSWD: ALL' >> /etc/sudoers.d/developer
+RUN echo 'Defaults    env_keep += "DEBIAN_FRONTEND"' >> /etc/sudoers.d/env_keep
 
 ENV DEBIAN_FRONTEND=1
-ENV PATH /usr/lib/ccache:$PATH
+ENV PATH=/usr/lib/ccache:$PATH
 
 COPY --chown=root:developer ./scripts/ /home/developer/scripts/
-RUN /home/developer/scripts/install.sh && /home/developer/scripts/mkdir.sh && /home/developer/scripts/ccache.sh && /home/developer/scripts/clone.sh && /home/developer/scripts/build.sh && make install -C /home/developer/nodejs/node && /home/developer/scripts/ncu.sh
+RUN /home/developer/scripts/install.sh
+RUN /home/developer/scripts/mkdir.sh
+RUN /home/developer/scripts/ccache.sh
+RUN /home/developer/scripts/clone.sh
+RUN /home/developer/scripts/build.sh
+RUN make install -C /home/developer/nodejs/node
+RUN /home/developer/scripts/ncu.sh
 
 WORKDIR /home/developer/nodejs/node

TODO.md

@@ -1,3 +1,5 @@
 - [x] Switch to `node:latest`
 - [x] Install `node-core-utils`
-- [x] Documentation 
+- [x] Documentation 
+- [ ] Split into multiple stages https://github.com/nodejs/devcontainer/pull/12#discussion_r2375074158
+- [ ] Reuse Dockerfile bits from https://github.com/nodejs/build/blob/main/ansible/roles/docker/templates

scripts/install.sh

@@ -8,13 +8,16 @@ package_list="
   curl \
   nano \
   python3 \
-  python-setuptools \
   python3-pip \
+  python-is-python3 \
   ninja-build \
   g++ \
-  sudo \
+  gcc \
+  g++-12 \
+  gcc-12 \
   make \
   git \
+  pkg-config \
   locales \
   gpg \
   wget"
@@ -29,7 +32,3 @@ echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githu
 gh_package_list="gh"
 apt-get update
 DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends $gh_package_list
-
-# No Sudo Prompt - thanks Electron for this
-echo 'developer ALL=NOPASSWD: ALL' >> /etc/sudoers.d/50-developer
-echo 'Defaults    env_keep += "DEBIAN_FRONTEND"' >> /etc/sudoers.d/env_keep

scripts/ncu.sh

@@ -2,7 +2,7 @@
 
 set -e # Exit with nonzero exit code if anything fails 
 
-npm install -g node-core-utils
+npm install -g @node-core/utils
 
 ncu-config set upstream upstream
 ncu-config set branch main