From 0d7c2bb9b81a298de37e4c7efb9e8196e9b7ab66 Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Wed, 10 Aug 2022 22:02:10 +0200 Subject: [PATCH] Revert "Add CI for Docker" This reverts commit e0b27d315b7b9af10748ceca88bd896cf7ecb914. --- .github/workflows/osrm-backend.yml | 10 ---------- docker/Dockerfile | 3 +-- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index ecc595e58..5c96b7f5e 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -47,16 +47,6 @@ jobs: ./scripts/format.sh && ./scripts/error_on_dirty.sh node ./scripts/validate_changelog.js npm run docs && ./scripts/error_on_dirty.sh - - docker-image: - needs: format-taginfo-docs - runs-on: ubuntu-22.04 - steps: - - name: Check out the repo - uses: actions/checkout@v3 - - name: Docker build - run: | - docker build -f docker/Dockerfile . build-test-publish: needs: format-taginfo-docs diff --git a/docker/Dockerfile b/docker/Dockerfile index 5c06dc8ea..fe0ee31ca 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -10,8 +10,7 @@ RUN apt-get update && \ COPY . /src WORKDIR /src -RUN NPROC=${BUILD_CONCURRENCY:-$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1)} && \ - echo "Building OSRM ${DOCKER_TAG}" && \ +RUN NPROC=${BUILD_CONCURRENCY:-$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1)} echo "Building OSRM ${DOCKER_TAG}" && \ git show --format="%H" | head -n1 > /opt/OSRM_GITSHA && \ echo "Building OSRM gitsha $(cat /opt/OSRM_GITSHA)" && \ mkdir -p build && \