Skip to content

Commit cb4cc6b

Browse files
authored
Merge pull request #351 from topcoder-platform/develop
PROD - Check Informix for reviews, if we're missing that data
2 parents 0dbc0c7 + 24c3ab3 commit cb4cc6b

11 files changed

+11785
-6173
lines changed

config/default.js

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,20 @@ module.exports = {
5555
'd6d31f34-8ee5-4589-ae65-45652fcc01a6': 30000720
5656
},
5757

58-
INTERNAL_CACHE_TTL: process.env.INTERNAL_CACHE_TTL || 1800
58+
INTERNAL_CACHE_TTL: process.env.INTERNAL_CACHE_TTL || 1800,
59+
INFORMIX: {
60+
SERVER: process.env.INFORMIX_SERVER || 'informixoltp_tcp', // informix server
61+
DATABASE: process.env.INFORMIX_DATABASE || 'tcs_catalog', // informix database
62+
HOST: process.env.INFORMIX_HOST || 'localhost', // host
63+
PROTOCOL: process.env.INFORMIX_PROTOCOL || 'onsoctcp',
64+
PORT: process.env.INFORMIX_PORT || '2021', // port
65+
DB_LOCALE: process.env.INFORMIX_DB_LOCALE || 'en_US.57372',
66+
USER: process.env.INFORMIX_USER || 'informix', // user
67+
PASSWORD: process.env.INFORMIX_PASSWORD || '1nf0rm1x', // password
68+
POOL_MAX_SIZE: parseInt(process.env.MAXPOOL, 10) || 60,
69+
maxsize: parseInt(process.env.MAXSIZE) || 0,
70+
minpool: parseInt(process.env.MINPOOL, 10) || 1,
71+
idleTimeout: parseInt(process.env.IDLETIMEOUT, 10) || 3600,
72+
timeout: parseInt(process.env.TIMEOUT, 10) || 30000
73+
}
5974
}

docker/Dockerfile

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

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

1010
# Install the dependencies from package.json
11-
RUN yarn install
11+
RUN npm install
12+
ENV INFORMIXDIR=/submissions-api/node_modules/informixdb/installer/onedb-odbc-driver
13+
ENV LD_LIBRARY_PATH=${INFORMIXDIR}/lib:${INFORMIXDIR}/lib/esql:${INFORMIXDIR}/lib/cli
1214
ENTRYPOINT node app.js

0 commit comments

Comments
 (0)