diff --git a/.docker/Dockerfile.php81 b/.docker/Dockerfile.php81 index 85fd58d..a6d72f8 100644 --- a/.docker/Dockerfile.php81 +++ b/.docker/Dockerfile.php81 @@ -56,8 +56,9 @@ RUN chmod uga+x /usr/local/bin/install-php-extensions && sync \ && chown -R www-data /var/www # Install NVM -RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \ - && export NVM_DIR="/root/.nvm" \ +RUN export NVM_DIR="/usr/local/nvm" \ + && mkdir -p "$NVM_DIR" \ + && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \ && . "$NVM_DIR/nvm.sh" \ && nvm install 20 \ && nvm alias default 20 \ @@ -65,7 +66,7 @@ RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | ba && ln -s "$NVM_DIR/versions/node/$NODE_VERSION/bin/node" /usr/local/bin/node \ && ln -s "$NVM_DIR/versions/node/$NODE_VERSION/bin/npm" /usr/local/bin/npm \ && ln -s "$NVM_DIR/versions/node/$NODE_VERSION/bin/npx" /usr/local/bin/npx \ - && echo 'export NVM_DIR="/root/.nvm"' > /etc/profile.d/nvm.sh \ + && echo 'export NVM_DIR="/usr/local/nvm"' > /etc/profile.d/nvm.sh \ && echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> /etc/profile.d/nvm.sh COPY config/php/* /usr/local/etc/php/conf.d/ diff --git a/.docker/Dockerfile.php82 b/.docker/Dockerfile.php82 index b8b08ab..caa064f 100644 --- a/.docker/Dockerfile.php82 +++ b/.docker/Dockerfile.php82 @@ -56,8 +56,9 @@ RUN chmod uga+x /usr/local/bin/install-php-extensions && sync \ && chown -R www-data /var/www # Install NVM -RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \ - && export NVM_DIR="/root/.nvm" \ +RUN export NVM_DIR="/usr/local/nvm" \ + && mkdir -p "$NVM_DIR" \ + && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \ && . "$NVM_DIR/nvm.sh" \ && nvm install 24 \ && nvm alias default 24 \ @@ -65,7 +66,7 @@ RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | ba && ln -s "$NVM_DIR/versions/node/$NODE_VERSION/bin/node" /usr/local/bin/node \ && ln -s "$NVM_DIR/versions/node/$NODE_VERSION/bin/npm" /usr/local/bin/npm \ && ln -s "$NVM_DIR/versions/node/$NODE_VERSION/bin/npx" /usr/local/bin/npx \ - && echo 'export NVM_DIR="/root/.nvm"' > /etc/profile.d/nvm.sh \ + && echo 'export NVM_DIR="/usr/local/nvm"' > /etc/profile.d/nvm.sh \ && echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> /etc/profile.d/nvm.sh COPY config/php/* /usr/local/etc/php/conf.d/ diff --git a/.docker/Dockerfile.php83 b/.docker/Dockerfile.php83 index 291de2a..c6aa670 100644 --- a/.docker/Dockerfile.php83 +++ b/.docker/Dockerfile.php83 @@ -56,8 +56,9 @@ RUN chmod uga+x /usr/local/bin/install-php-extensions && sync \ && chown -R www-data /var/www # Install NVM -RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \ - && export NVM_DIR="/root/.nvm" \ +RUN export NVM_DIR="/usr/local/nvm" \ + && mkdir -p "$NVM_DIR" \ + && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \ && . "$NVM_DIR/nvm.sh" \ && nvm install 24 \ && nvm alias default 24 \ @@ -65,7 +66,7 @@ RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | ba && ln -s "$NVM_DIR/versions/node/$NODE_VERSION/bin/node" /usr/local/bin/node \ && ln -s "$NVM_DIR/versions/node/$NODE_VERSION/bin/npm" /usr/local/bin/npm \ && ln -s "$NVM_DIR/versions/node/$NODE_VERSION/bin/npx" /usr/local/bin/npx \ - && echo 'export NVM_DIR="/root/.nvm"' > /etc/profile.d/nvm.sh \ + && echo 'export NVM_DIR="/usr/local/nvm"' > /etc/profile.d/nvm.sh \ && echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> /etc/profile.d/nvm.sh COPY config/php/* /usr/local/etc/php/conf.d/