Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
53 changes: 45 additions & 8 deletions .github/workflows/publish_latest.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
name: publish latest
name: publish dev
on:
workflow_dispatch:
schedule:
- cron: '0 0 * * 6'
push:
branches:
- 'master'
- 'dev/*'
paths-ignore:
- '.gitignore'
- '**.md'
Expand All @@ -27,10 +24,50 @@ jobs:

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Build and push images
- name: To LowerCase
run: |
echo "REPO_NAME=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}

- name: Build container image
run: |
docker buildx build --push --platform linux/amd64,linux/arm64 --tag ghcr.io/${{ github.repository }}/valhalla:latest .
docker buildx build --push --platform linux/amd64,linux/arm64 --tag ghcr.io/${{ env.REPO_NAME }}/valhalla:dev .
#name: publish latest
#on:
# workflow_dispatch:
# schedule:
# - cron: '0 0 * * 6'
# push:
# branches:
# - 'master'
# paths-ignore:
# - '.gitignore'
# - '**.md'
# - '**.template'
#
#jobs:
# publish:
# runs-on: ubuntu-latest
# steps:
# - name: Check out the repo
# uses: actions/checkout@v4
#
# - name: Log in to GitHub Docker Registry
# uses: docker/login-action@v3
# with:
# registry: ghcr.io
# username: ${{ github.actor }}
# password: ${{ secrets.GITHUB_TOKEN }}
#
# - name: Set up QEMU
# uses: docker/setup-qemu-action@v3
#
# - name: Set up Docker Buildx
# uses: docker/setup-buildx-action@v3
#
# - name: Build and push images
# run: |
# docker buildx build --push --platform linux/amd64,linux/arm64 --tag ghcr.io/${{ github.repository }}/valhalla:latest .
8 changes: 6 additions & 2 deletions .github/workflows/publish_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,14 @@ jobs:

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: To LowerCase
run: |
echo "REPO_NAME=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}

- name: Build container image
run: |
docker buildx build --push --platform linux/amd64,linux/arm64 --tag ghcr.io/${{ github.repository }}/valhalla:${{ steps.extract_branch.outputs.branch }} .
docker buildx build --push --platform linux/amd64,linux/arm64 --tag ghcr.io/${{ env.REPO_NAME }}/valhalla:${{ steps.extract_branch.outputs.branch }} .
16 changes: 8 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ RUN cd /usr/local/bin && \
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 <nils@gis-ops.com>

RUN apt-get update > /dev/null && \
export DEBIAN_FRONTEND=noninteractive && \
apt-get install -y libluajit-5.1-2 libgdal32 \
libzmq5 libczmq4 spatialite-bin libprotobuf-lite32 sudo locales \
libsqlite3-0 libsqlite3-mod-spatialite libcurl4 \
python3.11-minimal python3-distutils curl unzip moreutils jq spatialite-bin python-is-python3 > /dev/null
RUN export DEBIAN_FRONTEND=noninteractive && apt update && \
apt install -y \
libcurl4 libczmq4 libluajit-5.1-2 libgdal34 \
libprotobuf-lite32 libsqlite3-0 libsqlite3-mod-spatialite libzmq5 zlib1g \
curl gdb locales parallel python3-minimal python-is-python3 python3-shapely python3-requests \
spatialite-bin unzip wget jq curl unzip moreutils jq sudo && rm -rf /var/lib/apt/lists/*

COPY --from=builder /usr/local /usr/local
COPY --from=builder /usr/lib/python3/dist-packages/valhalla/* /usr/lib/python3/dist-packages/valhalla/
COPY --from=builder /usr/local/lib/python3.12/dist-packages/valhalla/* /usr/local/lib/python3.12/dist-packages/valhalla/

ENV LD_LIBRARY_PATH="/usr/local/lib:${LD_LIBRARY_PATH}"
# export the True defaults
Expand Down
Loading