Merge branch 'release' into dependabot/npm_and_yarn/typescript-5.6.3

hms-dbmi · Oct 22, 2024 · 34abbe2 · 34abbe2
2 parents 10094be + 464f0d6
commit 34abbe2
Show file tree

Hide file tree

Showing 26 changed files with 535 additions and 834 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Step 1: Build the app with node
-FROM node:22.9.0-alpine3.19 AS builder
+FROM node:23.0.0-alpine3.19 AS builder
 WORKDIR /app
 COPY package*.json .
 COPY .env .
@@ -12,22 +12,17 @@ RUN npm ci --omit dev
 FROM httpd:2.4.62-alpine
 
 RUN apk add --update openssl sed nodejs supervisor
-#TODO: volume mount the certs
+
 RUN mkdir -p ${HTTPD_PREFIX}/cert
-COPY cert ${HTTPD_PREFIX}/cert
-COPY httpd-vhosts.conf ${HTTPD_PREFIX}/conf/extra/httpd-vhosts.conf
 
 RUN sed -i '/^#Include conf.extra.httpd-vhosts.conf/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
-
 RUN sed -i '/^#LoadModule proxy_module/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
 RUN sed -i  '/^#LoadModule proxy_http_module/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
 RUN sed -i '/^#LoadModule proxy_connect_module/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
-
 RUN sed -i '/^#LoadModule ssl_module modules\/mod_ssl.so/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
 RUN sed -i '/^#LoadModule rewrite_module modules\/mod_rewrite.so/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
 RUN sed -i '/^#LoadModule socache_shmcb_module modules\/mod_socache_shmcb.so/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
 RUN mkdir -p /usr/local/apache2/logs/ssl_mutex
-
 RUN sed -i 's/Options Indexes FollowSymLinks/Options -Indexes +FollowSymLinks/' ${HTTPD_PREFIX}/conf/httpd.conf
 
 WORKDIR /app

diff --git a/Dockerfile.bdc b/Dockerfile.bdc
@@ -1,5 +1,5 @@
 # Step 1: Build the app with node
-FROM node:22.9.0-alpine3.19 AS builder
+FROM node:23.0.0-alpine3.19 AS builder
 WORKDIR /app
 COPY package*.json .
 COPY .env .

diff --git a/Dockerfile.prod b/Dockerfile.prod
@@ -1,5 +1,5 @@
 # Step 1: Build the app with node
-FROM node:22.9.0-alpine3.19 AS builder
+FROM node:23.0.0-alpine3.19 AS builder
 WORKDIR /app
 COPY package*.json .
 COPY .env .
@@ -12,17 +12,13 @@ RUN npm ci --omit dev
 FROM httpd:2.4.62-alpine
 
 RUN apk add --update openssl sed nodejs supervisor
-#TODO: volume mount the certs
+
 RUN mkdir -p ${HTTPD_PREFIX}/cert
-COPY cert ${HTTPD_PREFIX}/cert
-COPY httpd-vhosts.conf ${HTTPD_PREFIX}/conf/extra/httpd-vhosts.conf
 
 RUN sed -i '/^#Include conf.extra.httpd-vhosts.conf/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
-
 RUN sed -i '/^#LoadModule proxy_module/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
 RUN sed -i  '/^#LoadModule proxy_http_module/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
 RUN sed -i '/^#LoadModule proxy_connect_module/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
-
 RUN sed -i '/^#LoadModule ssl_module modules\/mod_ssl.so/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
 RUN sed -i '/^#LoadModule rewrite_module modules\/mod_rewrite.so/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
 RUN sed -i '/^#LoadModule socache_shmcb_module modules\/mod_socache_shmcb.so/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf