From bf732b9a6e628bc211f0a3c8bcceb80339dce258 Mon Sep 17 00:00:00 2001 From: Manuel <5673677+mtrezza@users.noreply.github.com> Date: Fri, 9 Apr 2021 16:40:03 +0200 Subject: [PATCH] Add build docker image to CI (#7332) * add build docker image to CI * remove node setup * removed local dependency to test passing docker build * Update CHANGELOG.md * Revert "removed local dependency to test passing docker build" This reverts commit a7801e1874be206c9f3f7bfd367766546bf483b6. * removed unnecessary docker build options * fixed docker build --- .dockerignore | 2 ++ .github/workflows/ci.yml | 8 ++++++++ CHANGELOG.md | 1 + Dockerfile | 4 ++++ package-lock.json | 2 +- package.json | 2 +- .../mock-mail-adapter}/index.js | 0 .../mock-mail-adapter}/package.json | 0 8 files changed, 17 insertions(+), 2 deletions(-) rename spec/{support/MockMailAdapter => dependencies/mock-mail-adapter}/index.js (100%) rename spec/{support/MockMailAdapter => dependencies/mock-mail-adapter}/package.json (100%) diff --git a/.dockerignore b/.dockerignore index c4eac56a..da15e925 100644 --- a/.dockerignore +++ b/.dockerignore @@ -16,6 +16,8 @@ lib/ # Tests spec/ +# Keep local dependencies used to CI tests +!spec/dependencies/ # IDEs .idea/ diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 777a839a..c4c4c06f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,6 +71,14 @@ jobs: - name: Install dependencies run: npm ci - run: npm run madge:circular + check-docker: + name: Docker Build + timeout-minutes: 5 + runs-on: ubuntu-18.04 + steps: + - uses: actions/checkout@v2 + - name: Build docker image + uses: docker/build-push-action@v2 check-mongo: strategy: matrix: diff --git a/CHANGELOG.md b/CHANGELOG.md index 67cebb83..fd2b7686 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -127,6 +127,7 @@ ___ - Added centralized feature deprecation with standardized warning logs (Manuel Trezza) [#7303](https://github.com/parse-community/parse-server/pull/7303) - Use Node.js 15.13.0 in CI (Olle Jonsson) [#7312](https://github.com/parse-community/parse-server/pull/7312) - Fix file upload issue for S3 compatible storage (Linode, DigitalOcean) by avoiding empty tags property when creating a file (Ali Oguzhan Yildiz) [#7300](https://github.com/parse-community/parse-server/pull/7300) +- Add building Docker image as CI check (Manuel Trezza) [#7332](https://github.com/parse-community/parse-server/pull/7332) ___ ## 4.5.0 [Full Changelog](https://github.com/parse-community/parse-server/compare/4.4.0...4.5.0) diff --git a/Dockerfile b/Dockerfile index bfc6b98d..dd500484 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,10 @@ RUN apk update; \ apk add git; WORKDIR /tmp COPY package*.json ./ + +# Copy local dependencies for CI tests +COPY spec/dependencies spec/dependencies + RUN npm ci COPY . . RUN npm run build diff --git a/package-lock.json b/package-lock.json index fab2525a..0dd5c8ac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9105,7 +9105,7 @@ } }, "mock-mail-adapter": { - "version": "file:spec/support/MockMailAdapter", + "version": "file:spec/dependencies/mock-mail-adapter", "dev": true }, "module-definition": { diff --git a/package.json b/package.json index 473ca037..a4df201c 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "jsdoc-babel": "0.5.0", "lint-staged": "10.2.3", "madge": "4.0.2", - "mock-mail-adapter": "file:spec/support/MockMailAdapter", + "mock-mail-adapter": "file:spec/dependencies/mock-mail-adapter", "mongodb-runner": "4.8.1", "mongodb-version-list": "1.0.0", "node-fetch": "2.6.1", diff --git a/spec/support/MockMailAdapter/index.js b/spec/dependencies/mock-mail-adapter/index.js similarity index 100% rename from spec/support/MockMailAdapter/index.js rename to spec/dependencies/mock-mail-adapter/index.js diff --git a/spec/support/MockMailAdapter/package.json b/spec/dependencies/mock-mail-adapter/package.json similarity index 100% rename from spec/support/MockMailAdapter/package.json rename to spec/dependencies/mock-mail-adapter/package.json