-
Notifications
You must be signed in to change notification settings - Fork 61
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'fix/dockerfile-fromascasing-warning'
- Loading branch information
Showing
1 changed file
with
17 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,17 @@ | ||
FROM debian:trixie-slim as builder | ||
FROM debian:trixie-slim AS builder | ||
LABEL [email protected] | ||
|
||
WORKDIR / | ||
|
||
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++ \ | ||
libssl-dev \ | ||
libasio-dev \ | ||
libglpk-dev \ | ||
pkg-config | ||
apt-get -y update > /dev/null && apt-get -y install > /dev/null \ | ||
git-core \ | ||
build-essential \ | ||
g++ \ | ||
libssl-dev \ | ||
libasio-dev \ | ||
libglpk-dev \ | ||
pkg-config | ||
|
||
ARG VROOM_EXPRESS_RELEASE=master | ||
|
||
|
@@ -22,12 +22,11 @@ RUN echo "Cloning and installing vroom-express release/branch ${VROOM_EXPRESS_RE | |
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 && \ | ||
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 node:20-bookworm-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 | ||
|
@@ -36,10 +35,10 @@ WORKDIR /vroom-express | |
|
||
RUN apt-get update > /dev/null && \ | ||
apt-get install -y --no-install-recommends \ | ||
libssl3 \ | ||
curl \ | ||
libglpk40 \ | ||
> /dev/null && \ | ||
libssl3 \ | ||
curl \ | ||
libglpk40 \ | ||
> /dev/null && \ | ||
rm -rf /var/lib/apt/lists/* && \ | ||
# Install vroom-express | ||
npm config set loglevel error && \ | ||
|
@@ -49,8 +48,8 @@ RUN apt-get update > /dev/null && \ | |
|
||
#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 | ||
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 \ | ||
|