Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ install_deploysuite: &install_deploysuite
cp ./../buildscript/buildenv.sh .
cp ./../buildscript/awsconfiguration.sh .
restore_cache_settings_for_build: &restore_cache_settings_for_build
key: docker-node-modules-{{ checksum "package-lock.json" }}
key: docker-node-modules-{{ checksum "yarn.lock" }}

save_cache_settings: &save_cache_settings
key: docker-node-modules-{{ checksum "package-lock.json" }}
key: docker-node-modules-{{ checksum "yarn.lock" }}
paths:
- node_modules

Expand Down
6 changes: 3 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ docker create --name app $APP_NAME:latest

if [ -d node_modules ]
then
mv package-lock.json old-package-lock.json
docker cp app:/$APP_NAME/package-lock.json package-lock.json
mv yarn.lock old-yarn.lock
docker cp app:/$APP_NAME/yarn.lock yarn.lock
set +eo pipefail
UPDATE_CACHE=$(cmp package-lock.json old-package-lock.json)
UPDATE_CACHE=$(cmp yarn.lock old-yarn.lock)
set -eo pipefail
else
UPDATE_CACHE=1
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use the base image with Node.js 10.19
FROM node:10.19
FROM node:12.22.12

# Copy the current directory into the Docker image
COPY . /challenge-processor-es
Expand All @@ -8,5 +8,5 @@ COPY . /challenge-processor-es
WORKDIR /challenge-processor-es

# Install the dependencies from package.json
RUN npm install
CMD npm start
RUN yarn install
CMD node src/app.js
Loading