Skip to content

Commit 3a5a04a

Browse files
authored
Merge pull request #298 from topcoder-platform/master
hotfix/inc-15
2 parents 7c93f3a + a744de7 commit 3a5a04a

File tree

7 files changed

+5812
-8666
lines changed

7 files changed

+5812
-8666
lines changed

.circleci/config.yml

Lines changed: 9 additions & 5 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 install jq
9-
sudo pip install awscli --upgrade
10-
sudo pip install docker-compose
8+
sudo apt install jq
9+
sudo apt update
10+
sudo apt install python3-pip
11+
sudo pip3 install awscli --upgrade
12+
sudo pip3 install docker-compose
1113
1214
install_deploysuite: &install_deploysuite
1315
name: Installation of install_deploysuite.
@@ -72,4 +74,6 @@ workflows:
7274
context : org-global
7375
filters:
7476
branches:
75-
only: master
77+
only:
78+
- master
79+
- hotfix/inc-15

app.js

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ const swaggerUi = require('swagger-ui-express')
1818
const YAML = require('yamljs')
1919
const authenticator = require('tc-core-library-js').middleware.jwtAuthenticator
2020
const fileUpload = require('express-fileupload')
21-
const memwatch = require('memwatch-next')
2221

2322
const swaggerDocument = YAML.load('./docs/swagger.yaml')
2423
const app = express()
@@ -31,19 +30,6 @@ app.use(bodyParser.urlencoded({ limit: '50mb', extended: true }))
3130
app.use(cors())
3231
app.use(fileUpload())
3332

34-
memwatch.on('leak', function (info) {
35-
winston.info(`Memory leak detected, details: ${info}`)
36-
const reqBody = {
37-
topic: 'common.error.reporting',
38-
originator: 'submission-api',
39-
timestamp: (new Date()).toISOString(), // time when submission was created
40-
'mime-type': 'application/json',
41-
payload: info
42-
}
43-
44-
helper.postToBusApi(reqBody)
45-
})
46-
4733
const apiRouter = express.Router()
4834

4935
/**

docker/Dockerfile

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

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

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

0 commit comments

Comments
 (0)