diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2024-06-12 11:51:48 +0000 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2024-06-12 11:51:48 +0000 |
| commit | a32a769990c1e5ebfd7ddbcbfc9c102f6639003a (patch) | |
| tree | 77720b57c5cfbcca4dc6ff95dbe5a09072df8125 /docker | |
| parent | 91ba000b9598c48a7609507ce1e7de6c84a68c35 (diff) | |
increase node version to >= 18, fixes #4285
Closes #4285
Merge request studip/studip!3102
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/studip/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/tests/php74/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/tests/php81/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/tests/php82/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/tests/php83/Dockerfile | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/docker/studip/Dockerfile b/docker/studip/Dockerfile index 0689c3a..fe9fc8c 100644 --- a/docker/studip/Dockerfile +++ b/docker/studip/Dockerfile @@ -19,7 +19,7 @@ RUN apt update && apt install -y --no-install-recommends \ RUN docker-php-ext-configure gd --with-jpeg --with-webp RUN docker-php-ext-install gettext gd zip pdo_mysql mysqli intl -FROM node:16 as nodejs +FROM node:18 as nodejs # Install node modules COPY . /studip diff --git a/docker/tests/php74/Dockerfile b/docker/tests/php74/Dockerfile index b982414..17d404a 100644 --- a/docker/tests/php74/Dockerfile +++ b/docker/tests/php74/Dockerfile @@ -14,8 +14,8 @@ RUN apt update && apt install -y --no-install-recommends \ RUN docker-php-ext-configure gd --with-jpeg --with-webp RUN docker-php-ext-install pdo gettext curl gd mbstring zip pdo pdo_mysql mysqli intl json -# Install npm using nvm -RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - +# Install node +RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - RUN apt update && apt install -y --no-install-recommends nodejs \ curl apt-transport-https ca-certificates gnupg unzip git \ && rm -rf /var/lib/apt/lists/* diff --git a/docker/tests/php81/Dockerfile b/docker/tests/php81/Dockerfile index 7d0478e..ceb1d2d 100644 --- a/docker/tests/php81/Dockerfile +++ b/docker/tests/php81/Dockerfile @@ -16,7 +16,7 @@ RUN docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-webp RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo pdo_mysql zip # Install node/npm -COPY --from=node:16-slim /usr/local/bin /usr/local/bin +COPY --from=node:18-slim /usr/local/bin /usr/local/bin # Install composer COPY --from=composer /usr/bin/composer /usr/bin/composer diff --git a/docker/tests/php82/Dockerfile b/docker/tests/php82/Dockerfile index c8abd9d..eee9aad 100644 --- a/docker/tests/php82/Dockerfile +++ b/docker/tests/php82/Dockerfile @@ -16,7 +16,7 @@ RUN docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-webp RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo pdo_mysql zip # Install node/npm -COPY --from=node:16-slim /usr/local/bin /usr/local/bin +COPY --from=node:18-slim /usr/local/bin /usr/local/bin # Install composer COPY --from=composer /usr/bin/composer /usr/bin/composer diff --git a/docker/tests/php83/Dockerfile b/docker/tests/php83/Dockerfile index 68d1764..b93795a 100644 --- a/docker/tests/php83/Dockerfile +++ b/docker/tests/php83/Dockerfile @@ -16,7 +16,7 @@ RUN docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-webp RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo_mysql zip # Install node/npm -COPY --from=node:16-slim /usr/local/bin /usr/local/bin +COPY --from=node:18-slim /usr/local/bin /usr/local/bin # Install composer COPY --from=composer /usr/bin/composer /usr/bin/composer |