Skip to content

Commit 3fa8814

Browse files
authored
Merge pull request #138 from CBIIT/1.5.5
merge 1.5.5 to main
2 parents f10f6d1 + e969201 commit 3fa8814

3 files changed

Lines changed: 7 additions & 6 deletions

File tree

Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:24.4.1-alpine3.22
1+
FROM node:24.10.0-alpine3.22
22

33
ENV PORT 8080
44
ENV NODE_ENV production
@@ -9,10 +9,11 @@ COPY package*.json ./
99

1010
RUN npm ci
1111

12-
#USER node
13-
1412
COPY --chown=node:node . .
1513

14+
# Run as non-root user for security
15+
USER node
16+
1617
EXPOSE 8080 9200 3306
1718

1819
CMD [ "node", "app.js" ]

Routes/application.routes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const router = express.Router();
44

55
router.get("/version", applicationControllers.version);
66
router.get("/widgetupdate", applicationControllers.getWidgetUpdate);
7-
router.post("/siteupdate", applicationControllers.getSiteUpdate);
7+
router.post("/releasenotes", applicationControllers.getSiteUpdate);
88
router.post('/glossaryTerms', applicationControllers.getGlossaryTerms);
99
router.post('/glossaryTermsByFirstLetter', applicationControllers.getGlossaryTermsByFirstLetter);
1010
router.get('/glossaryLetters', applicationControllers.getFirstLettersInGlossary);

Services/application.service.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const getWidgetUpdate = async () => {
2828
let widgetUpdateKey = cacheKeyGenerator.widgetUpdateKey();
2929
let result = cache.getValue(widgetUpdateKey);
3030
if (!result) {
31-
let sql = "select id, log_type, title, post_date, content_type, description from changelog order by post_date desc limit 3";
31+
let sql = "select id, log_type, title, version, post_date, content_type, description from changelog order by post_date desc limit 3";
3232

3333
let inserts = [];
3434
sql = mysql.format(sql, inserts);
@@ -41,7 +41,7 @@ const getWidgetUpdate = async () => {
4141
};
4242

4343
const getSiteUpdate = async (pageInfo) => {
44-
let sql = "select id, post_date, content_type, title, description as highlight, details as description from changelog where log_type = 1 order by post_date desc limit ?, ?";
44+
let sql = "select id, version, post_date, content_type, title, description as highlight, details as description from changelog where log_type = 1 order by post_date desc limit ?, ?";
4545

4646
let inserts = [
4747
( pageInfo.page - 1 ) * pageInfo.pageSize,

0 commit comments

Comments
 (0)