Docker debugging...

Author: trinitytakei

Dockerfile

@@ -32,15 +32,20 @@ FROM base AS nodejs
 # Install Node.js and Yarn
 ARG NODE_VERSION=23.7.0
 ARG YARN_VERSION=4.6.0
-ENV PATH=/usr/local/bin:$PATH
+ENV PATH=/usr/local/bin:$PATH \
+    COREPACK_HOME=/root/.cache/corepack
+
+RUN apt-get remove -y yarn || true && \
+    rm -f /usr/local/bin/yarn /usr/local/bin/yarnpkg
 
 RUN case "$(dpkg --print-architecture)" in \
       amd64) ARCH='x64' ;; \
       arm64) ARCH='arm64' ;; \
       *) echo "Unsupported architecture"; exit 1 ;; \
     esac \
-    && curl -v -fsSL "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${ARCH}.tar.xz" | tar -xJ -C /usr/local --strip-components=1 \
+    && curl -fsSL "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${ARCH}.tar.xz" | tar -xJ -C /usr/local --strip-components=1 \
     && npm install -g npm@latest \
+    && mkdir -p ${COREPACK_HOME} \
     && corepack enable \
     && corepack prepare yarn@${YARN_VERSION} --activate
 
@@ -79,18 +84,20 @@ RUN rm -rf node_modules
 FROM base
 
 ARG NODE_VERSION=23.7.0
+ARG YARN_VERSION=4.6.0
 
 # Set production environment for the host app (railsnew.io)
 ENV RAILS_ENV="production" \
     BUNDLE_WITHOUT="development:test" \
     NODE_VERSION=${NODE_VERSION} \
-    PATH=/usr/local/bin:$PATH
+    PATH=/usr/local/bin:$PATH \
+    COREPACK_HOME=/home/rails/.cache/corepack
 
 # Copy Node.js from nodejs stage
-COPY --from=nodejs /usr/local/bin/node /usr/local/bin/
-COPY --from=nodejs /usr/local/lib/node_modules/npm /usr/local/lib/node_modules/npm
-COPY --from=nodejs /usr/local/bin/npm /usr/local/bin/
-COPY --from=nodejs /usr/local/bin/npx /usr/local/bin/
+COPY --from=nodejs /usr/local/bin/ /usr/local/bin/
+COPY --from=nodejs /usr/local/lib/ /usr/local/lib/
+COPY --from=nodejs /usr/local/include/ /usr/local/include/
+COPY --from=nodejs /usr/local/share/ /usr/local/share/
 
 COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}"
 COPY --from=build /rails /rails
@@ -102,14 +109,24 @@ RUN groupadd --system --gid 1000 rails && \
     # Create base directories
     mkdir -p /var/lib/rails-new-io/workspaces && \
     mkdir -p /var/lib/rails-new-io/rails-env && \
+    mkdir -p ${COREPACK_HOME} && \
+    mkdir -p db log storage tmp && \
+    # Set permissions
     chown -R rails:rails /var/lib/rails-new-io && \
     chmod -R 755 /var/lib/rails-new-io && \
     chown -R rails:rails /rails && \
     chmod -R 755 /rails && \
-    chown -R rails:rails db log storage tmp /usr/local/bundle
+    chown -R rails:rails db log storage tmp /usr/local/bundle && \
+    chown -R rails:rails /home/rails/.cache
 
 USER rails
 
+# Set up Yarn
+RUN corepack enable && \
+    corepack prepare yarn@${YARN_VERSION} --activate && \
+    corepack use yarn@${YARN_VERSION} && \
+    yarn --version
+
 # Entrypoint prepares the database.
 ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 

bin/docker-entrypoint

@@ -38,6 +38,28 @@ if [ ! -d "/var/lib/rails-new-io/rails-env/ruby" ] || [ "$FORCE_ISOLATED_RUBY_RE
   echo "DEBUG: Copying system Ruby to isolated environment"
   cp -a /usr/local/* /var/lib/rails-new-io/rails-env/ruby/
 
+  # Overwrite Node.js stuff with our properly configured versions
+  echo "DEBUG: Overwriting Node.js binaries with symlinks to our configured versions"
+  rm -f /var/lib/rails-new-io/rails-env/ruby/bin/{node,npm,npx,corepack,yarn,yarnpkg}
+  rm -rf /var/lib/rails-new-io/rails-env/ruby/lib/node_modules
+  ln -sf /usr/local/bin/node /var/lib/rails-new-io/rails-env/ruby/bin/
+  ln -sf /usr/local/bin/npm /var/lib/rails-new-io/rails-env/ruby/bin/
+  ln -sf /usr/local/bin/npx /var/lib/rails-new-io/rails-env/ruby/bin/
+  ln -sf /usr/local/bin/corepack /var/lib/rails-new-io/rails-env/ruby/bin/
+
+  # Create our own yarn wrapper that bypasses Corepack
+  echo '#!/bin/bash
+echo "DEBUG: yarn called from $(pwd) with args: $@"
+echo "DEBUG: PATH=$PATH"
+echo "DEBUG: which yarn=$(which yarn)"
+echo "DEBUG: readlink -f $(which yarn)=$(readlink -f $(which yarn))"
+export COREPACK_ENABLE=0
+export NODE_OPTIONS="--no-corepack"
+exec "/usr/local/lib/node_modules/yarn/bin/yarn.js" "$@"
+' > /var/lib/rails-new-io/rails-env/ruby/bin/yarn
+  chmod +x /var/lib/rails-new-io/rails-env/ruby/bin/yarn
+  ln -sf /var/lib/rails-new-io/rails-env/ruby/bin/yarn /var/lib/rails-new-io/rails-env/ruby/bin/yarnpkg
+
   # Run the isolated environment setup in a subshell to avoid polluting the parent environment
   (
     # Unset any existing bundler environment variables that might interfere
@@ -57,6 +79,9 @@ if [ ! -d "/var/lib/rails-new-io/rails-env/ruby" ] || [ "$FORCE_ISOLATED_RUBY_RE
     export BUNDLE_USER_HOME=/var/lib/rails-new-io/rails-env/bundle     # Fix: Update path to match CommandExecutionService
     export BUNDLE_APP_CONFIG=/var/lib/rails-new-io/rails-env/bundle    # Fix: Update path to match CommandExecutionService
 
+    # Install Yarn globally first
+    npm install -g yarn@4.6.0
+
     echo "DEBUG: Updating RubyGems to 3.6.3"
     /var/lib/rails-new-io/rails-env/ruby/bin/gem update --system 3.6.3