Merge branch 'master' into fix/guppy-csrf

uc-cdis · Jan 4, 2024 · 381e69a · 381e69a
2 parents bcfd969 + fcfebe0
commit 381e69a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Docker/jenkins/Jenkins/Dockerfile b/Docker/jenkins/Jenkins/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/jenkins:2.434-jdk21
+FROM jenkins/jenkins:2.439-jdk21
 
 USER root
 

diff --git a/kube/services/ohdsi-webapi/ohdsi-webapi-deploy.yaml b/kube/services/ohdsi-webapi/ohdsi-webapi-deploy.yaml
@@ -83,7 +83,7 @@ spec:
             limits:
               memory: 4Gi  
         - name: ohdsi-webapi-reverse-proxy
-          image: nginx:1.23
+          image: 707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:1.23
           ports:
           - containerPort: 80
           volumeMounts:
@@ -97,4 +97,4 @@ spec:
               cpu: 100m
               memory: 100Mi
             limits:
-              memory: 500Mi
+              memory: 500Mi