Skip to content

Commit

Permalink
fix Docker file (build *and* run on bookworm), install libzip, zlib a…
Browse files Browse the repository at this point in the history
…nd libbz2, delete obsolete push-docker-image.sh, update README
  • Loading branch information
patrickbr committed Feb 15, 2024
1 parent 9a5fc2a commit a6b09de
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM debian:bookworm-slim AS builder
WORKDIR /app

RUN apt-get update && \
apt-get install -y g++ cmake git
apt-get install -y g++ cmake git libzip-dev zlib1g-dev libbz2-dev

ADD . /app
RUN mkdir build && \
Expand All @@ -13,10 +13,10 @@ RUN mkdir build && \
pwd && \
make install

FROM debian:buster-slim
FROM debian:bookworm-slim

RUN apt-get update && \
apt-get install -y libgomp1 && \
apt-get install -y libgomp1 libzip4 zlib1g libbz2-1.0 && \
rm -rf /var/lib/apt/lists/*

COPY --from=builder /usr/local/etc/pfaedle /usr/local/etc/pfaedle
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,17 @@ run.

## via Docker

You can use the [`adfreiburg/pfaedle` Docker image](https://hub.docker.com/r/adfreiburg/pfaedle) by mounting the OSM & GTFS data into the container:
You can use the [Docker image](https://github.com/orgs/ad-freiburg/packages/container/package/pfaedle) by mounting the OSM & GTFS data into the container:

```shell
docker pull ghcr.io/ad-freiburg/pfaedle:latest
docker run -i --rm \
# mount OSM data
--volume /path/to/osm/data:/osm \
# mount GTFS data
--volume /path/to/gtfs/data:/gtfs \
# tell pfaedle where to find the data
adfreiburg/pfaedle -x /osm/osm-data.xml -i /gtfs
ghcr.io/ad-freiburg/pfaedle:latest -x /osm/osm-data.xml.bz2 -i /gtfs/myfeed.zip
```

## Debugging
Expand Down
6 changes: 0 additions & 6 deletions push-docker-image.sh

This file was deleted.

0 comments on commit a6b09de

Please sign in to comment.