From 73a0603822ca578616d91ddb10d7625aa2611c05 Mon Sep 17 00:00:00 2001 From: baarkerlounger <5101747+baarkerlounger@users.noreply.github.com> Date: Wed, 22 Dec 2021 11:03:14 +0000 Subject: [PATCH] Revert "Revert "Bump node & fix docker image (#178)" (#179)" This reverts commit bbd8af9524d76c92909c305b6945c32bca8e9b34. --- .github/workflows/pipeline.yml | 2 +- .nvmrc | 2 +- Dockerfile | 2 +- package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 18bb5cee2..b1845661f 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -60,7 +60,7 @@ jobs: - name: Set up node uses: actions/setup-node@v2 with: - node-version: '14' + node-version: '16' - name: Create DB run: | diff --git a/.nvmrc b/.nvmrc index 8351c1939..b6a7d89c6 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -14 +16 diff --git a/Dockerfile b/Dockerfile index 3ff070143..a91fa4dc4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN apk add --update --no-cache tzdata && \ # build-base: complication tools for bundle # yarn: node package manager # postgresql-dev: postgres driver and libraries -RUN apk add --no-cache build-base yarn postgresql-dev +RUN apk add --no-cache build-base yarn postgresql-dev git # Install bundler to run bundle exec # This should be the same version as the Gemfile.lock diff --git a/package.json b/package.json index f27fbab7b..061c2da79 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "data-collector", "private": true, "engines": { - "node": "^14.0.0" + "node": "^16.0.0" }, "dependencies": { "@activeadmin/activeadmin": "^2.9.0",