fix Docker file (build *and* run on bookworm), install libzip, zlib and libbz2, delete obsolete push-docker-image.sh, update README
This commit is contained in:
parent
9a5fc2abdf
commit
a6b09de921
3 changed files with 6 additions and 11 deletions
|
@ -3,7 +3,7 @@ FROM debian:bookworm-slim AS builder
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
RUN apt-get update && \
|
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
|
ADD . /app
|
||||||
RUN mkdir build && \
|
RUN mkdir build && \
|
||||||
|
@ -13,10 +13,10 @@ RUN mkdir build && \
|
||||||
pwd && \
|
pwd && \
|
||||||
make install
|
make install
|
||||||
|
|
||||||
FROM debian:buster-slim
|
FROM debian:bookworm-slim
|
||||||
|
|
||||||
RUN apt-get update && \
|
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/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
COPY --from=builder /usr/local/etc/pfaedle /usr/local/etc/pfaedle
|
COPY --from=builder /usr/local/etc/pfaedle /usr/local/etc/pfaedle
|
||||||
|
|
|
@ -81,16 +81,17 @@ run.
|
||||||
|
|
||||||
## via Docker
|
## 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
|
```shell
|
||||||
|
docker pull ghcr.io/ad-freiburg/pfaedle:latest
|
||||||
docker run -i --rm \
|
docker run -i --rm \
|
||||||
# mount OSM data
|
# mount OSM data
|
||||||
--volume /path/to/osm/data:/osm \
|
--volume /path/to/osm/data:/osm \
|
||||||
# mount GTFS data
|
# mount GTFS data
|
||||||
--volume /path/to/gtfs/data:/gtfs \
|
--volume /path/to/gtfs/data:/gtfs \
|
||||||
# tell pfaedle where to find the data
|
# 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
|
## Debugging
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
set -ex
|
|
||||||
set -o pipefail
|
|
||||||
|
|
||||||
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
|
|
||||||
docker push adfreiburg/pfaedle
|
|
Loading…
Reference in a new issue