add some fixes

costateixeira · Aug 6, 2024 · f126c6d · f126c6d
1 parent 6d6e2db
commit f126c6d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ FROM ubuntu:24.04 as builder
 ENV DEBIAN_FRONTEND=noninteractive
 
 
-RUN apt update && apt install -y tzdata wget git unixodbc-dev libgtk2.0-dev xvfb sqlite3 libsqlite3-dev build-essential curl binutils
+RUN apt update && apt-get upgrade -y && apt install -y tzdata wget git unixodbc-dev libgtk2.0-dev xvfb sqlite3 libsqlite3-dev build-essential curl binutils && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Download and build OpenSSL 1.1.1w
 WORKDIR /tmp
@@ -103,7 +103,7 @@ ENV PORT=80
 ENV TERMINOLOGY_CACHE=/var/cache/txcache
 
 # Install runtime dependencies
-RUN apt-get update && apt-get install -y wget tzdata xvfb libgtk2.0-0 libsqlite3-dev curl \
+RUN apt-get update && apt-get upgrade -y && apt-get install -y wget tzdata xvfb libgtk2.0-0 libsqlite3-dev curl && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
     && mkdir -p $HOME/fhirserver/config $TERMINOLOGY_CACHE /fhirserver \
     && chmod -R 777 $TERMINOLOGY_CACHE \

diff --git a/server/endpoint_storage.pas b/server/endpoint_storage.pas
@@ -1080,7 +1080,7 @@ function TStorageWebEndpoint.SecureRequest(AContext: TIdContext; ip: String;
     else if request.Document = PathNoSlash then
     begin
       result := 'Home Page';
-      ReturnProcessedFile(request, response, Session, '/hompage.html', Common.SourceProvider.AltFile('/homepage.html', PathNoSlash), true)
+      ReturnProcessedFile(request, response, Session, '/homepage.html', Common.SourceProvider.AltFile('/homepage.html', PathNoSlash), true)
     end
     else
     begin

diff --git a/server/fhirserver.lpi b/server/fhirserver.lpi
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
     <Version Value="12"/>
@@ -18,8 +19,8 @@
     <VersionInfo>
       <UseVersionInfo Value="True"/>
       <MajorVersionNr Value="3"/>
-      <MinorVersionNr Value="4"/>
-      <RevisionNr Value="7"/>
+      <MinorVersionNr Value="6"/>
+      <RevisionNr Value="2"/>
       <Attributes pvaDebug="False"/>
     </VersionInfo>
     <BuildModes Count="8">
@@ -130,7 +131,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);..\library"/>
-            <Libraries Value="\usr\local\lib64\"/>
+            <Libraries Value="\usr\local\lib64"/>
             <OtherUnitFiles Value="..\library\fsl\tests;..\library\fhir\tests;..\library\fhir4\tests;..\library\fhir4b\tests;..\library\fhir5\tests;..\library\ftx\tests;..\library\fxver\tests;..\library\cda\tests;..\library\v2\tests;..\library\fdb\tests;modules;tests;admin;..\library\fcomp\tests;tx"/>
             <UnitOutputDirectory Value="lib\$(BuildMode)"/>
           </SearchPaths>
@@ -323,7 +324,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);../library"/>
-            <Libraries Value="/usr/local/lib64/;/tmp/openssl/lib/;/tmp/openssl/"/>
+            <Libraries Value="/usr/local/lib64;/tmp/openssl/lib;/tmp/openssl"/>
             <OtherUnitFiles Value="../library/fsl/tests;../library/fhir/tests;../library/fhir4/tests;../library/fhir4b/tests;../library/fhir5/tests;../library/ftx/tests;../library/fxver/tests;../library/cda/tests;../library/v2/tests;../library/fdb/tests;modules;tests;admin;../library/fcomp/tests;tx"/>
             <UnitOutputDirectory Value="lib/$(BuildMode)"/>
           </SearchPaths>
@@ -833,7 +834,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir);../library"/>
-      <Libraries Value="/usr/local/lib64/;/tmp/openssl/lib/;/tmp/openssl/"/>
+      <Libraries Value="/usr/local/lib64;/tmp/openssl/lib;/tmp/openssl"/>
       <OtherUnitFiles Value="../library/fsl/tests;../library/fhir/tests;../library/fhir4/tests;../library/fhir4b/tests;../library/fhir5/tests;../library/ftx/tests;../library/fxver/tests;../library/cda/tests;../library/v2/tests;../library/fdb/tests;modules;tests;admin;../library/fcomp/tests;tx"/>
       <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
@@ -1036,7 +1037,7 @@
         <Name Value="EPackageCrawlerException"/>
       </Item50>
       <Item51>
-        <Name Value="&lt;Unknown Class&gt;"/>
+        <Name Value="&lt;Unknown Class>"/>
       </Item51>
       <Item52>
         <Name Value="EDateFormatError"/>

diff --git a/server/web/diagnostics.html b/server/web/diagnostics.html
@@ -15,7 +15,7 @@ <h3>Current Activity</h3>
 <ul>
   <li>Background Thread: [%status.thread%]</li>
   <li>CDS client instances: [%status.cds.client%]</li>
-<li>[%status.web-total-count%] total requests for [%status.web-total-time%]ms. [%status.web-rest-count%] REST requests for [%status.web-rest-time%]ms. [%status.run-time%] since starting ({%status.run-time.ms%]ms)</li>
+<li>[%status.web-total-count%] total requests for [%status.web-total-time%]ms. [%status.web-rest-count%] REST requests for [%status.web-rest-time%]ms. [%status.run-time%] since starting ([%status.run-time.ms%] ms)</li>
 </ul>
 
 [%status.web%]