diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2022-10-12 11:42:48 +0000 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2022-10-12 11:42:48 +0000 |
| commit | a9668016512b77112eae786ef9625de7544cfbd0 (patch) | |
| tree | d3bd60a55899d5cd2c1b21d3626cc7ca23fcca5c /docker | |
| parent | 1deade6ba05557e880b9ab11fb304d832540d89d (diff) | |
adjust minimal node.js version, fixes #1662
Closes #1662
Merge request studip/studip!1069
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Readme.md | 1 | ||||
| -rw-r--r-- | docker/studip/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/tests/php72/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/tests/php74/Dockerfile | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/docker/Readme.md b/docker/Readme.md index a4a2a71..bff10df 100644 --- a/docker/Readme.md +++ b/docker/Readme.md @@ -6,4 +6,3 @@ You can trigger an automated push to the studip docker repository by providing t `./build_images.sh push` All images are automatically built for linux/amd64 -\ No newline at end of file
\ No newline at end of file diff --git a/docker/studip/Dockerfile b/docker/studip/Dockerfile index ec20ce1..de3a4b1 100644 --- a/docker/studip/Dockerfile +++ b/docker/studip/Dockerfile @@ -18,7 +18,7 @@ RUN apt update && apt install -y --no-install-recommends \ RUN docker-php-ext-configure gd --with-jpeg RUN docker-php-ext-install pdo gettext curl gd mbstring zip pdo pdo_mysql mysqli intl json -FROM node:12 as nodejs +FROM node:14 as nodejs # Install node modules COPY . /studip @@ -57,4 +57,4 @@ RUN chmod u+x /usr/local/bin/docker-entrypoint.sh # Set start parameters ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] -CMD ["apache2-foreground"]
\ No newline at end of file +CMD ["apache2-foreground"] diff --git a/docker/tests/php72/Dockerfile b/docker/tests/php72/Dockerfile index 796d064..17cafe5 100644 --- a/docker/tests/php72/Dockerfile +++ b/docker/tests/php72/Dockerfile @@ -15,7 +15,7 @@ RUN docker-php-ext-configure gd --with-png-dir=/usr/include/ \ 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_12.x | bash - +RUN curl -sL https://deb.nodesource.com/setup_14.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/php74/Dockerfile b/docker/tests/php74/Dockerfile index 7d77515..57557c2 100644 --- a/docker/tests/php74/Dockerfile +++ b/docker/tests/php74/Dockerfile @@ -14,7 +14,7 @@ RUN docker-php-ext-configure gd --with-jpeg 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_12.x | bash - +RUN curl -sL https://deb.nodesource.com/setup_14.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/* |