From ef48dbf4b0ec94c65365b13304b55dccf46b1f73 Mon Sep 17 00:00:00 2001 From: Dirk Stolle Date: Fri, 17 May 2024 19:09:31 +0200 Subject: [PATCH] Revert "use Node.js 20 (current LTS) and Debian 12 in Dockerfile" This reverts commit cec6cce0db84b69117e59b62130e7a6bc765fbe4. --- Dockerfile | 13 +++++++------ changelog.md | 6 ------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index bd2cd31..07252a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:12-slim +FROM debian:11-slim MAINTAINER Dirk Stolle LABEL org.opencontainers.image.authors="Dirk Stolle " @@ -7,21 +7,22 @@ LABEL org.opencontainers.image.licenses=GPL-3.0-or-later # Always update package lists and install updates first. # HTTPS transport for APT is required to get the Node.js packages. -# curl, GnuPG and CA certificates are needed to get the key for the Nodesource +# wget, GnuPG and CA certificates are needed to get the key for the Nodesource # APT repository. # Finally, libfontconfig is required during execution to get font rendering. -ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get upgrade -y && \ apt-get install --no-install-recommends -y \ apt-transport-https \ - curl \ + wget \ gnupg2 \ dirmngr \ ca-certificates \ libfontconfig1 # Node.js is required to run this application. -RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \ - echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" > /etc/apt/sources.list.d/nodejs.list +RUN echo "# Node.js 14.x for Debian 11 (codename bullseye)" > /etc/apt/sources.list.d/nodejs.list \ + && echo "deb https://deb.nodesource.com/node_14.x bullseye main" >> /etc/apt/sources.list.d/nodejs.list \ + && echo "deb-src https://deb.nodesource.com/node_14.x bullseye main" >> /etc/apt/sources.list.d/nodejs.list +RUN apt-key adv --fetch-keys https://deb.nodesource.com/gpgkey/nodesource.gpg.key RUN apt-get update && apt-get install --no-install-recommends -y nodejs # Create directory for application. RUN mkdir -p /opt/export-server diff --git a/changelog.md b/changelog.md index a8d71e8..5048270 100644 --- a/changelog.md +++ b/changelog.md @@ -10,12 +10,6 @@ Since [ECharts](https://echarts.apache.org/) is the main dependency of this application, major version changes in ECharts will also trigger a major version change in this application. -## Version 5.?.? (2024-05-??) - -* __[maintenance]__ -Update Dockerfile to use Debian 12 and Node.js 20 instead of Debian 11 and -Node.js 14. - ## Version 5.1.2 (2024-03-31) * __[maintenance]__