diff --git a/.github/workflows/publish_latest.yaml b/.github/workflows/publish_latest.yaml index c6636d3..8d271ad 100644 --- a/.github/workflows/publish_latest.yaml +++ b/.github/workflows/publish_latest.yaml @@ -1,36 +1,36 @@ -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 . +#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 . diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index 4188dea..57e03a6 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -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 }} . diff --git a/Dockerfile b/Dockerfile index 918a812..1590dbe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # remove a few superfluous things and # create a new runner image from ubuntu:24.04 # with the previous runner's artifacts -ARG VALHALLA_BUILDER_IMAGE=ghcr.io/valhalla/valhalla:latest +ARG VALHALLA_BUILDER_IMAGE=ghcr.io/valhalla/valhalla:3.5.0 FROM $VALHALLA_BUILDER_IMAGE as builder MAINTAINER Nils Nolde @@ -16,16 +16,15 @@ RUN cd /usr/local/bin && \ FROM ubuntu:24.04 as runner_base MAINTAINER Nils Nolde -RUN apt-get update > /dev/null && \ - export DEBIAN_FRONTEND=noninteractive && \ - apt-get install -y libluajit-5.1-2 libgdal34 \ - libzmq5 libczmq4 spatialite-bin libprotobuf-lite32 sudo locales \ - libsqlite3-0 libsqlite3-mod-spatialite libcurl4 \ - python3.12-minimal python3-requests python3-shapely python-is-python3 \ - curl unzip moreutils jq spatialite-bin > /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/local/lib/python3.12/dist-packages/valhalla /usr/local/lib/python3.12/dist-packages/ +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