Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ubuntu update to 24.04 LTS #40

Merged
merged 1 commit into from
Dec 18, 2024
Merged

ubuntu update to 24.04 LTS #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@ WORKDIR /app
# Install vis
RUN apt-get update -y > /dev/null && \
apt-get install -y \
apt-transport-https \
ca-certificates \
python-is-python3 \
python3-pip \
python3-venv \
curl > /dev/null && \
python -m pip install --upgrade pip --break-system-packages
apt-transport-https \
ca-certificates \
python-is-python3 \
python3-pip \
python3-venv \
curl > /dev/null

ENV POETRY_BIN /root/.local/bin/poetry

Expand Down Expand Up @@ -42,21 +41,21 @@ RUN . app_venv/bin/activate && \

# remove some stuff from the original image
RUN cd /usr/local/bin && \
preserve="valhalla_service valhalla_build_tiles valhalla_build_config valhalla_build_admins valhalla_build_timezones valhalla_build_elevation valhalla_ways_to_edges valhalla_build_extract valhalla_export_edges valhalla_add_predicted_traffic" && \
mv $preserve .. && \
for f in valhalla*; do rm $f; done && \
cd .. && mv $preserve ./bin
preserve="valhalla_service valhalla_build_tiles valhalla_build_config valhalla_build_admins valhalla_build_timezones valhalla_build_elevation valhalla_ways_to_edges valhalla_build_extract valhalla_export_edges valhalla_add_predicted_traffic" && \
mv $preserve .. && \
for f in valhalla*; do rm $f; done && \
cd .. && mv $preserve ./bin

FROM ubuntu:23.04 as runner_base
FROM ubuntu:24.04 as runner_base
MAINTAINER Nils Nolde <[email protected]>

# install Valhalla stuff
RUN apt-get update > /dev/null && \
export DEBIAN_FRONTEND=noninteractive && \
apt-get install -y libluajit-5.1-2 \
libzmq5 libgdal-dev libczmq4 spatialite-bin libprotobuf-lite32 sudo locales wget \
libsqlite3-0 libsqlite3-mod-spatialite libcurl4 python-is-python3 osmctools \
python3.11-minimal python3-distutils curl unzip moreutils jq spatialite-bin supervisor > /dev/null
apt-get install -y libluajit-5.1-dev \
libzmq5 libgdal-dev libczmq4 spatialite-bin libprotobuf-lite32 sudo locales wget \
libsqlite3-0 libsqlite3-mod-spatialite libcurl4 python-is-python3 osmctools \
python3.12-minimal curl unzip moreutils jq spatialite-bin supervisor > /dev/null

WORKDIR /app

Expand Down
Loading