From 1927aadd0b839d9e6b985c32f4ce8fabc79ccba5 Mon Sep 17 00:00:00 2001
From: Joe Wragg <joe.wragg@bigchange.com>
Date: Tue, 8 Oct 2024 09:06:28 +0100
Subject: [PATCH] intsall packages from trixie

---
 Dockerfile | 49 +++++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a9de5b2..3f73f4e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,27 +7,27 @@ RUN echo "Updating apt-get and installing dependencies..." && \
   apt-get -y update > /dev/null && apt-get -y install > /dev/null \
   git-core \
   build-essential \
-  g++ \
+	g++ \
   libssl-dev \
-  libasio-dev \
+	libasio-dev \
   libglpk-dev \
-  pkg-config
+	pkg-config
 
 ARG VROOM_EXPRESS_RELEASE=master
 
 # clone here, since the runner image doesn't have git installed
 RUN echo "Cloning and installing vroom-express release/branch ${VROOM_EXPRESS_RELEASE}..." && \
-  git clone --branch $VROOM_EXPRESS_RELEASE --single-branch https://github.com/VROOM-Project/vroom-express.git
+    git clone --branch $VROOM_EXPRESS_RELEASE --single-branch https://github.com/VROOM-Project/vroom-express.git
 
 ARG VROOM_RELEASE=master
 
 RUN echo "Cloning and installing vroom release/branch ${VROOM_RELEASE}..." && \
-  git clone --branch $VROOM_RELEASE  --single-branch --recurse-submodules https://github.com/VROOM-Project/vroom.git && \
-  cd vroom && \
-  make -C /vroom/src -j$(nproc)
+    git clone --branch $VROOM_RELEASE  --single-branch --recurse-submodules https://github.com/VROOM-Project/vroom.git && \
+    cd vroom && \
+    make -C /vroom/src -j$(nproc)
 
 
-FROM debian:trixie-slim as runstage
+FROM node:20-bookworm-slim as runstage
 
 COPY --from=builder /vroom-express/. /vroom-express
 COPY --from=builder /vroom/bin/vroom /usr/local/bin
@@ -35,25 +35,26 @@ COPY --from=builder /vroom/bin/vroom /usr/local/bin
 WORKDIR /vroom-express
 
 RUN apt-get update > /dev/null && \
-  apt-get install -y --no-install-recommends \
-  libssl3 \
-  curl \
-  libglpk40 \
-  > /dev/null && \
-  curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \
-  apt-get install -y nodejs npm && \
-  npm install --global yarn && \
-  rm -rf /var/lib/apt/lists/* && \
-  # Install vroom-express
-  npm config set loglevel error && \
-  npm install && \
-  # To share the config.yml & access.log file with the host
-  mkdir /conf
-
+    apt-get install -y --no-install-recommends \
+      libssl3 \
+      curl \
+      libglpk40 \
+      > /dev/null && \
+    rm -rf /var/lib/apt/lists/* && \
+    # Install vroom-express
+    npm config set loglevel error && \
+    npm install && \
+    # To share the config.yml & access.log file with the host
+    mkdir /conf
+
+#Upgrade glibc
+RUN echo "deb http://ftp.debian.org/debian trixie main" >> /etc/apt/sources.list && \
+  apt-get update > /dev/null && \
+  apt-get -t trixie install libc6 libc6-dev libc6-dbg libstdc++6 libgcc-s1 libzstd1 -y
 
 COPY ./docker-entrypoint.sh /docker-entrypoint.sh
 ENV VROOM_DOCKER=osrm \
-  VROOM_LOG=/conf
+    VROOM_LOG=/conf
 
 HEALTHCHECK --start-period=10s CMD curl --fail -s http://localhost:3000/health || exit 1