Skip to content

Commit eef85ce

Browse files
authored
Merge pull request #95 from topcoder-platform/master
hotfix/inc-15
2 parents 29360fe + 1870dd3 commit eef85ce

File tree

5 files changed

+4303
-5560
lines changed

5 files changed

+4303
-5560
lines changed

.circleci/config.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
version: 2
22
defaults: &defaults
33
docker:
4-
- image: circleci/python:2.7-stretch-browsers
4+
- image: cimg/python:3.11.0-browsers
55
install_dependency: &install_dependency
66
name: Installation of build and deployment dependencies.
77
command: |
8+
sudo apt update
89
sudo apt install jq
9-
sudo pip install awscli --upgrade
10-
sudo pip install docker-compose
10+
sudo apt install python3-pip
11+
sudo pip3 install awscli --upgrade
12+
sudo pip3 install docker-compose
1113
install_deploysuite: &install_deploysuite
1214
name: Installation of install_deploysuite.
1315
command: |
@@ -16,10 +18,10 @@ install_deploysuite: &install_deploysuite
1618
cp ./../buildscript/buildenv.sh .
1719
cp ./../buildscript/awsconfiguration.sh .
1820
restore_cache_settings_for_build: &restore_cache_settings_for_build
19-
key: docker-node-modules-{{ checksum "package-lock.json" }}
21+
key: docker-node-modules-{{ checksum "yarn.lock" }}
2022

2123
save_cache_settings: &save_cache_settings
22-
key: docker-node-modules-{{ checksum "package-lock.json" }}
24+
key: docker-node-modules-{{ checksum "yarn.lock" }}
2325
paths:
2426
- node_modules
2527

@@ -74,4 +76,6 @@ workflows:
7476
context : org-global
7577
filters:
7678
branches:
77-
only: master
79+
only:
80+
- master
81+
- hotfix/inc-15

docker/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Use the base image with Node.js
2-
FROM node:8.9.2
2+
FROM node:12.22.12
33

44
# Copy the current directory into the Docker image
55
COPY . /member-api-v5
@@ -8,6 +8,6 @@ COPY . /member-api-v5
88
WORKDIR /member-api-v5
99

1010
# Install the dependencies from package.json
11-
RUN npm install
11+
RUN yarn
1212

13-
CMD npm start
13+
CMD yarn start

0 commit comments

Comments
 (0)