Merge pull request #67 from LibreCodeCoop/chore/change-npm-setup

Chore/change npm setup
LibreCodeCoop · May 16, 2024 · e455a98 · e455a98
2 parents 96c44f7 + 9c6f608
commit e455a98
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/.docker/Dockerfile.php80 b/.docker/Dockerfile.php80
@@ -48,9 +48,12 @@ RUN chmod uga+x /usr/local/bin/install-php-extensions && sync \
     # pevent errors when try to create files at /var/www with user www-data
     && chown -R www-data /var/www
 
-COPY --from=node:20.11-slim /usr/local/lib/node_modules /usr/local/lib/node_modules
-COPY --from=node:20.11-slim /usr/local/bin/node /usr/local/bin/node
-RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm
+# Install NVM
+RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
+    && export NVM_DIR="/root/.nvm" \
+    && . "$NVM_DIR/nvm.sh" \
+    && nvm install 14 && nvm install 16 && nvm install 20 \
+    && nvm alias default 20
 
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 COPY config/php/* /usr/local/etc/php/conf.d/

diff --git a/.docker/Dockerfile.php81 b/.docker/Dockerfile.php81
@@ -48,9 +48,12 @@ RUN chmod uga+x /usr/local/bin/install-php-extensions && sync \
     # pevent errors when try to create files at /var/www with user www-data
     && chown -R www-data /var/www
 
-COPY --from=node:20.11-slim /usr/local/lib/node_modules /usr/local/lib/node_modules
-COPY --from=node:20.11-slim /usr/local/bin/node /usr/local/bin/node
-RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm
+# Install NVM
+RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
+    && export NVM_DIR="/root/.nvm" \
+    && . "$NVM_DIR/nvm.sh" \
+    && nvm install 14 && nvm install 16 && nvm install 20 \
+    && nvm alias default 20
 
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 COPY config/php/* /usr/local/etc/php/conf.d/

diff --git a/.docker/Dockerfile.php82 b/.docker/Dockerfile.php82
@@ -48,9 +48,12 @@ RUN chmod uga+x /usr/local/bin/install-php-extensions && sync \
     # pevent errors when try to create files at /var/www with user www-data
     && chown -R www-data /var/www
 
-COPY --from=node:20.11-slim /usr/local/lib/node_modules /usr/local/lib/node_modules
-COPY --from=node:20.11-slim /usr/local/bin/node /usr/local/bin/node
-RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm
+# Install NVM
+RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
+    && export NVM_DIR="/root/.nvm" \
+    && . "$NVM_DIR/nvm.sh" \
+    && nvm install 14 && nvm install 16 && nvm install 20 \
+    && nvm alias default 20
 
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 COPY config/php/* /usr/local/etc/php/conf.d/

diff --git a/.docker/scripts/entrypoint.sh b/.docker/scripts/entrypoint.sh
@@ -72,6 +72,8 @@ EOF
 
     occ config:app:set core backgroundjobs_mode      --value "cron"
 
+    occ config:system:set auth.bruteforce.protection.enabled --value false --type boolean
+
     if [ ! -d "apps-extra/hmr_enabler" ]; then
         git clone --progress --single-branch --depth 1 https://github.com/nextcloud/hmr_enabler apps-extra/hmr_enabler
         composer -d apps-extra/hmr_enambler/ i