Merge branch 'fix-metis-cpm' into 'master'

[cmake] Try to apply git patch for metis only once.

See merge request ogs/ogs!4790

scripts/cmake/Dependencies.cmake

@@ -412,6 +412,7 @@ if(OGS_BUILD_UTILS)
             GIT_REPOSITORY https://github.com/KarypisLab/METIS
             VERSION 5.2.1
             EXCLUDE_FROM_ALL YES
+            UPDATE_DISCONNECTED ON
             PATCH_COMMAND git apply
                           ${PROJECT_SOURCE_DIR}/scripts/cmake/metis.patch
             OPTIONS ${_metis_options}

scripts/docker/Dockerfile.web

@@ -4,16 +4,18 @@ CMD [ "/bin/bash" ]
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     --no-install-recommends curl git gnupg2 && \
     rm -rf /var/lib/apt/lists/*
-RUN apt -y install curl dirmngr apt-transport-https ca-certificates \
-    && curl -sL https://deb.nodesource.com/setup_16.x | bash - \
-    && apt-get -y install nodejs npm \
+RUN apt -y install curl dirmngr apt-transport-https ca-certificates gnupg \
+    && mkdir -p /etc/apt/keyrings \
+    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+    && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
+    && apt-get update \
+    && apt-get -y install nodejs \
     && rm -rf /var/lib/apt/lists/*
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
     && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
     && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y yarn \
     && rm -rf /var/lib/apt/lists/*
-RUN yarn global add node-gyp
-RUN yarn global add netlify-cli
+RUN npm install netlify-cli -g
 ENV HUGO_VERSION=0.117.0
 RUN curl -fSL -O "https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb" \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y /hugo_extended_${HUGO_VERSION}_linux-amd64.deb \

web/data/versions.json

@@ -72,8 +72,8 @@
     }
   },
   "cpm": {
-    "package_file_id": 1029,
-    "package_file_sha256": "baca0a575a0c7053e4c7a5bffb32bb30d8dce0ae97308858b3bf8a690063b303"
+    "package_file_id": 1048,
+    "package_file_sha256": "fe5b6489d66351dfac09622ac53d3fd987b2b7d81df01038ad0c2e316d6a3ebd"
   },
   "ext": {
     "cache_hash": "4ebd62e0ce484732dbf3cd9932f60b67762e156b"