From 8e3254c49e9acce790caa6ac4cb5e0f394f17db0 Mon Sep 17 00:00:00 2001 From: zhouyu Date: Wed, 4 Feb 2026 09:09:04 -0800 Subject: [PATCH 1/9] test --- .nvmrc | 1 + Dockerfile | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 .nvmrc diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 00000000..a45fd52c --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +24 diff --git a/Dockerfile b/Dockerfile index 22e1688b..5ebe1422 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,22 +45,33 @@ RUN apt-get install -y --no-install-recommends \ # Add Node.js package repository (version 16 LTS release) & install Node.js # -- note that the Node.js setup script takes care of updating the package list -RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \ +RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash - \ && apt-get install -y --no-install-recommends nodejs +RUN which node && node -v + # Add Yarn package repository, update package list, & install Yarn RUN curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr/share/keyrings/yarnkey.gpg >/dev/null \ && echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" | tee /etc/apt/sources.list.d/yarn.list \ && apt-get update -qq \ && apt-get install -y --no-install-recommends yarn +# RUN corepack enable \ +# && corepack prepare yarn@1.22.22 --activate \ +# && yarn -v + +# Verify Node.js and Yarn are installed +RUN which yarn && yarn --version + # Remove packages we only needed as part of the Node.js / Yarn repository # setup and installation -- note that the Node.js setup scripts installs # a full version of Python, but at runtime we only need a minimal version RUN apt-mark manual python3-minimal \ && apt-get autoremove --purge -y \ - curl \ - python3 + curl \ + python3 + + # ------------------------------------------------------------ # Run configuration From 63e41e19e307552ff4e4ba4bf336a384435bf639 Mon Sep 17 00:00:00 2001 From: zhouyu Date: Wed, 4 Feb 2026 13:19:37 -0800 Subject: [PATCH 2/9] test --- Dockerfile | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5ebe1422..e7fb98e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -66,11 +66,15 @@ RUN which yarn && yarn --version # Remove packages we only needed as part of the Node.js / Yarn repository # setup and installation -- note that the Node.js setup scripts installs # a full version of Python, but at runtime we only need a minimal version -RUN apt-mark manual python3-minimal \ - && apt-get autoremove --purge -y \ - curl \ - python3 +# RUN apt-mark manual nodejs python3-minimal \ +# && apt-get autoremove --purge -y \ +# curl \ +# python3 +RUN echo '!!!!!!' +#RUN which node && node -v +RUN which yarn && yarn --version +RUN echo '^^^^^' # ------------------------------------------------------------ @@ -119,12 +123,12 @@ RUN apt-get install -y --no-install-recommends \ USER $APP_USER # Base image ships with an older version of bundler -RUN gem install bundler --version 2.7.2 +# RUN gem install bundler --version 2.7.2 # Install gems. We don't enforce the validity of the Gemfile.lock until the # final (production) stage. COPY --chown=$APP_USER:$APP_USER Gemfile* .ruby-version ./ -RUN bundle install +# RUN bundle install # ------------------------------------------------------------ # Install JS packages @@ -164,8 +168,8 @@ COPY --from=development --chown=$APP_USER /opt/app /opt/app COPY --from=development --chown=$APP_USER /usr/local/bundle /usr/local/bundle # Ensure the bundle is installed and the Gemfile.lock is synced. -RUN bundle config set frozen 'true' -RUN bundle install --local +# RUN bundle config set frozen 'true' +# RUN bundle install --local # Ensure JS modules are installed and yarn.lock is synced RUN yarn install --immutable From 997957b9325dc33a96e3abdc700e3dfa7c60548d Mon Sep 17 00:00:00 2001 From: zhouyu Date: Wed, 4 Feb 2026 21:30:15 -0800 Subject: [PATCH 3/9] test --- Dockerfile | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index e7fb98e7..6756f557 100644 --- a/Dockerfile +++ b/Dockerfile @@ -66,11 +66,16 @@ RUN which yarn && yarn --version # Remove packages we only needed as part of the Node.js / Yarn repository # setup and installation -- note that the Node.js setup scripts installs # a full version of Python, but at runtime we only need a minimal version -# RUN apt-mark manual nodejs python3-minimal \ -# && apt-get autoremove --purge -y \ +# RUN apt-mark manual nodejs python3-minimal +# RUN apt-get autoremove --purge -y \ # curl \ # python3 +RUN apt-mark manual nodejs python3-minimal \ + && apt-get autoremove --purge -y + +RUN apt-get remove -y curl + RUN echo '!!!!!!' #RUN which node && node -v RUN which yarn && yarn --version @@ -123,12 +128,12 @@ RUN apt-get install -y --no-install-recommends \ USER $APP_USER # Base image ships with an older version of bundler -# RUN gem install bundler --version 2.7.2 +RUN gem install bundler --version 2.7.2 # Install gems. We don't enforce the validity of the Gemfile.lock until the # final (production) stage. COPY --chown=$APP_USER:$APP_USER Gemfile* .ruby-version ./ -# RUN bundle install +RUN bundle install # ------------------------------------------------------------ # Install JS packages @@ -168,8 +173,8 @@ COPY --from=development --chown=$APP_USER /opt/app /opt/app COPY --from=development --chown=$APP_USER /usr/local/bundle /usr/local/bundle # Ensure the bundle is installed and the Gemfile.lock is synced. -# RUN bundle config set frozen 'true' -# RUN bundle install --local +RUN bundle config set frozen 'true' +RUN bundle install --local # Ensure JS modules are installed and yarn.lock is synced RUN yarn install --immutable From 480ad625ff136a0950d28e600fb51dc55c3f3390 Mon Sep 17 00:00:00 2001 From: zhouyu Date: Fri, 6 Feb 2026 14:48:10 -0800 Subject: [PATCH 4/9] keep python 3 --- Dockerfile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6756f557..5da24f3c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -71,14 +71,19 @@ RUN which yarn && yarn --version # curl \ # python3 -RUN apt-mark manual nodejs python3-minimal \ - && apt-get autoremove --purge -y +RUN apt-mark manual nodejs python3.13-minimal -RUN apt-get remove -y curl +RUN apt-get autoremove --purge -y + +# RUN apt-cache rdepends nodejs + +RUN apt-get remove -y curl RUN echo '!!!!!!' #RUN which node && node -v RUN which yarn && yarn --version +RUN apt-mark showmanual +RUN apt-mark showauto RUN echo '^^^^^' From db6add269f08f0a9a4be894144831bde30d9d481 Mon Sep 17 00:00:00 2001 From: zhouyu Date: Mon, 9 Feb 2026 15:33:05 -0800 Subject: [PATCH 5/9] before clean up --- Dockerfile | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5da24f3c..76dc8689 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,18 +50,18 @@ RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash - \ RUN which node && node -v -# Add Yarn package repository, update package list, & install Yarn -RUN curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr/share/keyrings/yarnkey.gpg >/dev/null \ - && echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" | tee /etc/apt/sources.list.d/yarn.list \ - && apt-get update -qq \ - && apt-get install -y --no-install-recommends yarn +# # Add Yarn package repository, update package list, & install Yarn +# RUN curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr/share/keyrings/yarnkey.gpg >/dev/null \ +# && echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" | tee /etc/apt/sources.list.d/yarn.list \ +# && apt-get update -qq \ +# && apt-get install -y --no-install-recommends yarn -# RUN corepack enable \ -# && corepack prepare yarn@1.22.22 --activate \ -# && yarn -v +RUN corepack enable \ + && corepack prepare yarn@stable --activate \ + && yarn -v # Verify Node.js and Yarn are installed -RUN which yarn && yarn --version +# RUN which yarn && yarn --version # Remove packages we only needed as part of the Node.js / Yarn repository # setup and installation -- note that the Node.js setup scripts installs @@ -71,20 +71,19 @@ RUN which yarn && yarn --version # curl \ # python3 -RUN apt-mark manual nodejs python3.13-minimal - -RUN apt-get autoremove --purge -y +RUN apt-mark manual python3.13-minimal \ + && apt-get autoremove --purge -y curl # RUN apt-cache rdepends nodejs -RUN apt-get remove -y curl +# RUN apt-get remove -y curl -RUN echo '!!!!!!' -#RUN which node && node -v -RUN which yarn && yarn --version +# RUN echo '!!!!!!' +# #RUN which node && node -v +# RUN which yarn && yarn --version RUN apt-mark showmanual RUN apt-mark showauto -RUN echo '^^^^^' +# RUN echo '^^^^^' # ------------------------------------------------------------ From f392b52c83da39c615b68b27796d50107e8d4ab9 Mon Sep 17 00:00:00 2001 From: zhouyu Date: Mon, 9 Feb 2026 16:00:36 -0800 Subject: [PATCH 6/9] clean up --- Dockerfile | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index 76dc8689..b927d492 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,44 +48,24 @@ RUN apt-get install -y --no-install-recommends \ RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash - \ && apt-get install -y --no-install-recommends nodejs -RUN which node && node -v - # # Add Yarn package repository, update package list, & install Yarn # RUN curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr/share/keyrings/yarnkey.gpg >/dev/null \ # && echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" | tee /etc/apt/sources.list.d/yarn.list \ # && apt-get update -qq \ # && apt-get install -y --no-install-recommends yarn +# Use Yarn via Corepack to avoids using reops and GPG keys RUN corepack enable \ && corepack prepare yarn@stable --activate \ && yarn -v -# Verify Node.js and Yarn are installed -# RUN which yarn && yarn --version - # Remove packages we only needed as part of the Node.js / Yarn repository # setup and installation -- note that the Node.js setup scripts installs # a full version of Python, but at runtime we only need a minimal version -# RUN apt-mark manual nodejs python3-minimal -# RUN apt-get autoremove --purge -y \ -# curl \ -# python3 RUN apt-mark manual python3.13-minimal \ && apt-get autoremove --purge -y curl -# RUN apt-cache rdepends nodejs - -# RUN apt-get remove -y curl - -# RUN echo '!!!!!!' -# #RUN which node && node -v -# RUN which yarn && yarn --version -RUN apt-mark showmanual -RUN apt-mark showauto -# RUN echo '^^^^^' - - # ------------------------------------------------------------ # Run configuration From adc49cd2fcf549e0ca07b6700288fb9d608e7a3d Mon Sep 17 00:00:00 2001 From: zhouyu Date: Mon, 9 Feb 2026 17:11:03 -0800 Subject: [PATCH 7/9] Clean up old commented code --- .nvmrc | 1 - Dockerfile | 6 ------ 2 files changed, 7 deletions(-) delete mode 100644 .nvmrc diff --git a/.nvmrc b/.nvmrc deleted file mode 100644 index a45fd52c..00000000 --- a/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -24 diff --git a/Dockerfile b/Dockerfile index b927d492..cc2ba3a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,12 +48,6 @@ RUN apt-get install -y --no-install-recommends \ RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash - \ && apt-get install -y --no-install-recommends nodejs -# # Add Yarn package repository, update package list, & install Yarn -# RUN curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr/share/keyrings/yarnkey.gpg >/dev/null \ -# && echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" | tee /etc/apt/sources.list.d/yarn.list \ -# && apt-get update -qq \ -# && apt-get install -y --no-install-recommends yarn - # Use Yarn via Corepack to avoids using reops and GPG keys RUN corepack enable \ && corepack prepare yarn@stable --activate \ From e2fcae7fecb97047859674f07b154f2bc07c5024 Mon Sep 17 00:00:00 2001 From: zhouyu Date: Tue, 10 Feb 2026 12:42:39 -0800 Subject: [PATCH 8/9] test --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index cc2ba3a4..21ae33a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -57,8 +57,7 @@ RUN corepack enable \ # setup and installation -- note that the Node.js setup scripts installs # a full version of Python, but at runtime we only need a minimal version -RUN apt-mark manual python3.13-minimal \ - && apt-get autoremove --purge -y curl +RUN apt-get autoremove --purge -y curl # ------------------------------------------------------------ # Run configuration @@ -155,7 +154,7 @@ RUN bundle config set frozen 'true' RUN bundle install --local # Ensure JS modules are installed and yarn.lock is synced -RUN yarn install --immutable +# RUN yarn install --immutable # ------------------------------------------------------------ # Precompile production assets From aa55c1955e8c5e59941b36068758f1df09e26406 Mon Sep 17 00:00:00 2001 From: zhouyu Date: Tue, 10 Feb 2026 13:17:09 -0800 Subject: [PATCH 9/9] remove to keep specific python version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 21ae33a0..57fcc587 100644 --- a/Dockerfile +++ b/Dockerfile @@ -154,7 +154,7 @@ RUN bundle config set frozen 'true' RUN bundle install --local # Ensure JS modules are installed and yarn.lock is synced -# RUN yarn install --immutable +RUN yarn install --immutable # ------------------------------------------------------------ # Precompile production assets