diff --git a/Dockerfile b/Dockerfile index 7502f9d..e7e8bb8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 && \ @@ -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 diff --git a/README.md b/README.md index 435fe6e..58beaeb 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/push-docker-image.sh b/push-docker-image.sh deleted file mode 100644 index af6f3fb..0000000 --- a/push-docker-image.sh +++ /dev/null @@ -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