From d0dfbd8b3c9b5492b998da2615c63cad2d2c0c50 Mon Sep 17 00:00:00 2001 From: Joxit Date: Sat, 28 May 2022 14:37:48 +0200 Subject: [PATCH] ci: move from circleci to github actions --- .circleci/config.yml | 12 ------------ .github/workflows/push.yml | 13 +++++++++++++ Dockerfile | 2 +- package.json | 1 + 4 files changed, 15 insertions(+), 13 deletions(-) delete mode 100644 .circleci/config.yml create mode 100644 .github/workflows/push.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index c1f237c..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,12 +0,0 @@ -version: 2 -jobs: - build: - working_directory: /app - docker: - - image: docker:18.06.1-ce-git - steps: - - checkout - - setup_remote_docker - - run: - name: Build and push image to Docker Hub - command: apk --no-cache add curl bash && curl "https://raw.githubusercontent.com/pelias/ci-tools/master/build-docker-images.sh" | bash - diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml new file mode 100644 index 0000000..9043c43 --- /dev/null +++ b/.github/workflows/push.yml @@ -0,0 +1,13 @@ +name: Continuous Integration +on: push +jobs: + build-docker-images: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Build Docker images + env: + DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} + DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + run: | + curl "https://raw.githubusercontent.com/pelias/ci-tools/master/build-docker-images.sh" | bash - \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 5ed5061..5702ff6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ FROM pelias/baseimage as better_sqlite3 # this adds ~400MB to the image, so we build in a # separate image and only copy the files we need. RUN apt-get update -y -RUN apt-get install -y clang +RUN apt-get install -y clang python3 make # copy runtime COPY --from=runtime /opt/spatial /opt/spatial diff --git a/package.json b/package.json index 8060d05..fe51bc5 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "@mapbox/polyline": "^1.1.1", "@turf/buffer": "^5.1.5", "better-sqlite3": "^7.0.1", + "bindings": "^1.5.0", "csv-parse": "^4.8.2", "express": "^4.17.1", "express-handlebars": "^3.1.0",