Skip to content

Commit 3ffa7c8

Browse files
authored
Merge pull request #98 from LibreCodeCoop/fix/nvm-initialization
fix: nvm initialization
2 parents ae0df9c + d725482 commit 3ffa7c8

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

.docker/Dockerfile.php81

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | ba
6060
&& export NVM_DIR="/root/.nvm" \
6161
&& . "$NVM_DIR/nvm.sh" \
6262
&& nvm install 20 \
63-
&& nvm alias default 20
63+
&& nvm alias default 20 \
64+
&& echo 'export NVM_DIR="/root/.nvm"' > /etc/profile.d/nvm.sh \
65+
&& echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> /etc/profile.d/nvm.sh
6466

6567
COPY config/php/* /usr/local/etc/php/conf.d/
6668
COPY scripts/* /var/www/scripts/

.docker/Dockerfile.php82

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,10 @@ RUN chmod uga+x /usr/local/bin/install-php-extensions && sync \
5959
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
6060
&& export NVM_DIR="/root/.nvm" \
6161
&& . "$NVM_DIR/nvm.sh" \
62-
&& nvm install 22 \
63-
&& nvm alias default 22
62+
&& nvm install 24 \
63+
&& nvm alias default 24 \
64+
&& echo 'export NVM_DIR="/root/.nvm"' > /etc/profile.d/nvm.sh \
65+
&& echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> /etc/profile.d/nvm.sh
6466

6567
COPY config/php/* /usr/local/etc/php/conf.d/
6668
COPY scripts/* /var/www/scripts/

.docker/Dockerfile.php83

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,10 @@ RUN chmod uga+x /usr/local/bin/install-php-extensions && sync \
5959
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
6060
&& export NVM_DIR="/root/.nvm" \
6161
&& . "$NVM_DIR/nvm.sh" \
62-
&& nvm install 22 \
63-
&& nvm alias default 22
62+
&& nvm install 24 \
63+
&& nvm alias default 24 \
64+
&& echo 'export NVM_DIR="/root/.nvm"' > /etc/profile.d/nvm.sh \
65+
&& echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> /etc/profile.d/nvm.sh
6466

6567
COPY config/php/* /usr/local/etc/php/conf.d/
6668
COPY scripts/* /var/www/scripts/

0 commit comments

Comments
 (0)