From c4a7199aa8bee3bf23a79d1b27e941a8534ea7bb Mon Sep 17 00:00:00 2001 From: Jose Costa Teixeira Date: Sat, 1 Oct 2022 13:49:40 +0200 Subject: [PATCH 01/20] fix snomed import --- library/ftx/ftx_loinc_services.pas | 18 ++++++++++++++++-- library/ftx/ftx_sct_services.pas | 15 +++++++++++---- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/library/ftx/ftx_loinc_services.pas b/library/ftx/ftx_loinc_services.pas index 3572160cd..00db1fa19 100644 --- a/library/ftx/ftx_loinc_services.pas +++ b/library/ftx/ftx_loinc_services.pas @@ -35,7 +35,8 @@ Uses SysUtils, Classes, Generics.Collections, {$IFDEF FPC} LazUTF8,{$ELSE} IOUtils, RegularExpressions, {$ENDIF} fsl_base, fsl_utilities, fsl_stream, fsl_collections, fsl_fpc, fsl_lang, fsl_http, - fhir_objects, fhir_common, fhir_utilities, fhir_factory, fhir_features, fhir_uris, + fhir_objects, fhir_common, fhir_utilities, fhir_factory, + fhir_features, fhir_uris, fhir_cdshooks, ftx_service; @@ -526,6 +527,13 @@ function memU16ToString(const bytes : TBytes; index : cardinal; chars : word) : // the bytes contain UTF8 function memU8toString(bytes : TBytes; index, chars : integer) : String; +{$IFNDEF FPC} +var + utf8str: UTF8String; +{$ENDIF} + var UTFEncoding: TEncoding; + theseBytes:TBytes; + begin if chars = 0 then exit(''); @@ -535,7 +543,13 @@ function memU8toString(bytes : TBytes; index, chars : integer) : String; setLength(result, chars); Move(bytes[index], result[1], chars); {$ELSE} - result := TEncoding.UTF8.GetString(bytes, index, chars); + UTFEncoding:= TEncoding.UTF8; + theseBytes := Copy(bytes, index, chars); + try + result :=UTFEncoding.GetString(theseBytes); + except + writeln(result) + end; {$ENDIF} end; diff --git a/library/ftx/ftx_sct_services.pas b/library/ftx/ftx_sct_services.pas index d9fd6aea5..7f9a98764 100644 --- a/library/ftx/ftx_sct_services.pas +++ b/library/ftx/ftx_sct_services.pas @@ -57,7 +57,7 @@ } Uses - SysUtils, Classes, Generics.Collections, Character, + SysUtils, Classes, Generics.Collections, Character, Dialogs, fsl_base, fsl_utilities, fsl_collections, fsl_http, fsl_fpc, fsl_threads, fsl_lang, fhir_objects, fhir_common, fhir_factory, fhir_utilities, fhir_features, fhir_uris, fhir_cdshooks, @@ -822,7 +822,7 @@ function TSnomedStrings.GetEntry(iIndex: Cardinal): String; if FIsUTF16 then result := memU16ToString(FMaster, iIndex+2, i) else - result := memU8ToString(FMaster, iIndex+2, i) + result := memU8ToString(FMaster, iIndex+2, i) end; procedure TSnomedStrings.Reopen; @@ -834,13 +834,20 @@ procedure TSnomedStrings.Reopen; function TSnomedStrings.AddString(const s: String): Cardinal; var i : word; + b : TBytes; begin if Length(s) > 65535 Then raise ETerminologySetup.Create('Snomed Description too long: '+String(s)); result := FBuilder.Length; - i := length(s); + if FIsUTF16 then + b := TEncoding.BigEndianUnicode.GetBytes(s) + else + b := TEncoding.UTF8.GetBytes(s) ; + + i := length(b); FBuilder.AddWord(i); - FBuilder.AddString1Byte(s); + FBuilder.Append(b); + end; procedure TSnomedStrings.clear; From 12d8838d6c0a3fd7545029a3761eb8ba32a5ae64 Mon Sep 17 00:00:00 2001 From: Jose Costa Teixeira Date: Sun, 14 May 2023 14:14:48 +0100 Subject: [PATCH 02/20] try to fix codescan --- .github/workflows/linux-docker-build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/linux-docker-build.yml b/.github/workflows/linux-docker-build.yml index f261596d2..2d84e7e41 100644 --- a/.github/workflows/linux-docker-build.yml +++ b/.github/workflows/linux-docker-build.yml @@ -35,6 +35,9 @@ jobs: . - name: Scan Code run: | + export DISPLAY=0:0 + xhost + + export DISPLAY=$IP:0 docker run --entrypoint /work/fhirserver/utilities/codescan/codescan fhirserver /work/bootstrap - name: Prepare ini file env: From 2e03db61a02c3489d45b6ece67ee7ec35012f01c Mon Sep 17 00:00:00 2001 From: Jose Costa Teixeira Date: Sun, 14 May 2023 14:44:44 +0100 Subject: [PATCH 03/20] Update linux-docker-build.yml --- .github/workflows/linux-docker-build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/linux-docker-build.yml b/.github/workflows/linux-docker-build.yml index 2d84e7e41..c3ba4a72d 100644 --- a/.github/workflows/linux-docker-build.yml +++ b/.github/workflows/linux-docker-build.yml @@ -36,8 +36,6 @@ jobs: - name: Scan Code run: | export DISPLAY=0:0 - xhost + - export DISPLAY=$IP:0 docker run --entrypoint /work/fhirserver/utilities/codescan/codescan fhirserver /work/bootstrap - name: Prepare ini file env: From f1db005dd7650560b20da28392b72048db8e111b Mon Sep 17 00:00:00 2001 From: Jose Costa Teixeira Date: Sun, 14 May 2023 19:39:01 +0200 Subject: [PATCH 04/20] remove codescan --- .github/workflows/linux-docker-build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux-docker-build.yml b/.github/workflows/linux-docker-build.yml index c3ba4a72d..82a530db7 100644 --- a/.github/workflows/linux-docker-build.yml +++ b/.github/workflows/linux-docker-build.yml @@ -33,10 +33,10 @@ jobs: docker build \ --tag fhirserver \ . - - name: Scan Code - run: | - export DISPLAY=0:0 - docker run --entrypoint /work/fhirserver/utilities/codescan/codescan fhirserver /work/bootstrap +# - name: Scan Code +# run: | +# export DISPLAY=0:0 +# docker run --entrypoint /work/fhirserver/utilities/codescan/codescan fhirserver /work/bootstrap - name: Prepare ini file env: FHIRSERVER_LOCATIONS_CLONE_PATH: /work/fhirserver From 2754368d49febf45dbc6a74d4fe706df601ab4f6 Mon Sep 17 00:00:00 2001 From: Jose Costa Teixeira Date: Thu, 1 Jun 2023 15:30:17 +0200 Subject: [PATCH 05/20] Update linux-docker-build.yml --- .github/workflows/linux-docker-build.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/linux-docker-build.yml b/.github/workflows/linux-docker-build.yml index 82a530db7..f74088d9a 100644 --- a/.github/workflows/linux-docker-build.yml +++ b/.github/workflows/linux-docker-build.yml @@ -66,3 +66,15 @@ jobs: -v ~/terminology:/terminology \ -v ~/test-settings.ini:/work/fhirserver/exec/64/test-settings.ini \ fhirserver -tests + - + name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Tag and push Docker image + run: | + docker tag fhirserver ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:version1 + docker push fhirserver ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:version1 + From 9c1700d847588b7c89ff7e0e182c57809861182f Mon Sep 17 00:00:00 2001 From: Jose Costa Teixeira Date: Thu, 1 Jun 2023 16:08:34 +0200 Subject: [PATCH 06/20] Update linux-docker-build.yml --- .github/workflows/linux-docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux-docker-build.yml b/.github/workflows/linux-docker-build.yml index f74088d9a..cd4d23c8d 100644 --- a/.github/workflows/linux-docker-build.yml +++ b/.github/workflows/linux-docker-build.yml @@ -76,5 +76,5 @@ jobs: - name: Tag and push Docker image run: | docker tag fhirserver ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:version1 - docker push fhirserver ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:version1 + docker push ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:version1 From f331280497c500213bd6f350f6618bf4bca8cc41 Mon Sep 17 00:00:00 2001 From: Jose Costa Teixeira Date: Mon, 5 Jun 2023 09:10:08 +0200 Subject: [PATCH 07/20] update docker run line --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5b23bf246..da920b680 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,4 +37,4 @@ chmod +x /bin/entrypoint.sh ENTRYPOINT ["/bin/entrypoint.sh"] -CMD ["-cmd", "exec", "-cfg", "http://tx.fhir.org/config", "-version", "4", "-local", "$TERMINOLOGY_CACHE"] +CMD ["-cmd", "exec", "-cfg", "https://storage.googleapis.com/tx-fhir-org", "-version", "5", "-local", "$TERMINOLOGY_CACHE"] From 712fa80c14715dab7e1cbfa719ff29c72b1cb373 Mon Sep 17 00:00:00 2001 From: Jose Costa Teixeira Date: Tue, 6 Jun 2023 11:39:48 +0100 Subject: [PATCH 08/20] Update linux-docker-build.yml --- .github/workflows/linux-docker-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux-docker-build.yml b/.github/workflows/linux-docker-build.yml index cd4d23c8d..8164af372 100644 --- a/.github/workflows/linux-docker-build.yml +++ b/.github/workflows/linux-docker-build.yml @@ -75,6 +75,6 @@ jobs: - name: Tag and push Docker image run: | - docker tag fhirserver ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:version1 - docker push ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:version1 + docker tag fhirserver ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:latest + docker push ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:latest From eac875b2e90fdd6eb31f77fcfcecfcf796bb9450 Mon Sep 17 00:00:00 2001 From: Jose Costa Teixeira Date: Sat, 10 Jun 2023 20:43:41 +0200 Subject: [PATCH 09/20] serve static files --- server/web_base.pas | 4 ++++ server/web_server.pas | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/server/web_base.pas b/server/web_base.pas index 9c917f586..e94938f32 100644 --- a/server/web_base.pas +++ b/server/web_base.pas @@ -432,6 +432,10 @@ function TFHIRWebServerBase.IsTerminologyServerOnly: boolean; result := 'video/mpeg' Else if AExt = '.js' Then result := 'text/javascript' + else if AExt = '.html' then // Add this case + result := 'text/html' // Use 'text/html' for .html files + else + Else Begin {$IFDEF WINDOWS} diff --git a/server/web_server.pas b/server/web_server.pas index 23bfa40bb..2d94655c4 100644 --- a/server/web_server.pas +++ b/server/web_server.pas @@ -677,6 +677,7 @@ procedure TFhirWebServer.PlainRequest(AContext: TIdContext; ok : boolean; epn, cid, ip : String; tt : TTimeTracker; + fullPath: String; begin // when running with a reverse proxy, it's easier to let the reverse proxy just use non-ssl upstream, and pass through the certificate details se we know SSL is being used if (Common.SSLHeaderValue <> '') and (request.RawHeaders.Values['X-Client-SSL'] = Common.SSLHeaderValue) then @@ -742,6 +743,25 @@ procedure TFhirWebServer.PlainRequest(AContext: TIdContext; if not ok then begin + // Get full path of the requested document + fullPath := SourceProvider.AltFile(request.Document, '/'); + + // If the path corresponds to a directory, look for a default file + if TDirectory.Exists(fullPath) then + begin + // List of possible default files + const DefaultFiles: array[0..2] of String = ('index.html', 'index.htm', 'default.html'); + + for var DefaultFile in DefaultFiles do + begin + if TFile.Exists(fullPath + '/' + DefaultFile) then + begin + ReturnSpecFile(response, request.Document + '/' + DefaultFile, fullPath + '/' + DefaultFile, false); + Exit; // Exit the procedure after serving a default file + end; + end; + end; + if request.Document = '/diagnostics' then begin epn := 'WS'; From 7b642d593287067e5de140880df0c5b888820354 Mon Sep 17 00:00:00 2001 From: Jose Costa Teixeira Date: Sun, 11 Jun 2023 09:01:49 +0200 Subject: [PATCH 10/20] fix copy paste issue --- server/web_base.pas | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/web_base.pas b/server/web_base.pas index e94938f32..ab34a7376 100644 --- a/server/web_base.pas +++ b/server/web_base.pas @@ -435,8 +435,6 @@ function TFHIRWebServerBase.IsTerminologyServerOnly: boolean; else if AExt = '.html' then // Add this case result := 'text/html' // Use 'text/html' for .html files else - - Else Begin {$IFDEF WINDOWS} Try From 9cc28e2ff1e8ff076f319cf5d663e08578974460 Mon Sep 17 00:00:00 2001 From: Jose Costa Teixeira Date: Sun, 11 Jun 2023 09:59:00 +0200 Subject: [PATCH 11/20] Update web_server.pas --- server/web_server.pas | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/server/web_server.pas b/server/web_server.pas index 2d94655c4..cafba3d4f 100644 --- a/server/web_server.pas +++ b/server/web_server.pas @@ -678,7 +678,17 @@ procedure TFhirWebServer.PlainRequest(AContext: TIdContext; epn, cid, ip : String; tt : TTimeTracker; fullPath: String; + DefaultFiles: array[0..2] of String; + DefaultFile: String; + i: Integer; + begin + + DefaultFiles[0] := 'index.html'; + DefaultFiles[1] := 'index.htm'; + DefaultFiles[2] := 'default.html'; + + // when running with a reverse proxy, it's easier to let the reverse proxy just use non-ssl upstream, and pass through the certificate details se we know SSL is being used if (Common.SSLHeaderValue <> '') and (request.RawHeaders.Values['X-Client-SSL'] = Common.SSLHeaderValue) then SecureRequest(aContext, request, response) @@ -747,14 +757,12 @@ procedure TFhirWebServer.PlainRequest(AContext: TIdContext; fullPath := SourceProvider.AltFile(request.Document, '/'); // If the path corresponds to a directory, look for a default file - if TDirectory.Exists(fullPath) then + if DirectoryExists(fullPath) then begin - // List of possible default files - const DefaultFiles: array[0..2] of String = ('index.html', 'index.htm', 'default.html'); - - for var DefaultFile in DefaultFiles do + for i := 0 to 2 do begin - if TFile.Exists(fullPath + '/' + DefaultFile) then + DefaultFile := DefaultFiles[i]; + if FileExists(fullPath + '/' + DefaultFile) then begin ReturnSpecFile(response, request.Document + '/' + DefaultFile, fullPath + '/' + DefaultFile, false); Exit; // Exit the procedure after serving a default file From ef362729ecf429a7dfa6db0e7f9eb17d5e9bde0f Mon Sep 17 00:00:00 2001 From: Jose Costa Teixeira Date: Sun, 11 Jun 2023 14:07:18 +0200 Subject: [PATCH 12/20] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8d9195777..59d25705a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,4 +38,4 @@ chmod +x /bin/entrypoint.sh ENTRYPOINT ["/bin/entrypoint.sh"] -CMD ["-cmd", "exec", "-cfg", "https://storage.googleapis.com/tx-fhir-org", "-version", "5", "-local", "$TERMINOLOGY_CACHE"] +CMD ["-cmd", "exec", "-cfg", "config.ini", "-local", "$TERMINOLOGY_CACHE"] From f3c1eb44b91f65da132cd994ad0b7159216571c8 Mon Sep 17 00:00:00 2001 From: Jose Costa Teixeira Date: Sun, 11 Jun 2023 15:08:26 +0200 Subject: [PATCH 13/20] simple local config --- Dockerfile | 2 +- config/config.ini | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 config/config.ini diff --git a/Dockerfile b/Dockerfile index 59d25705a..6f02f5b09 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,4 +38,4 @@ chmod +x /bin/entrypoint.sh ENTRYPOINT ["/bin/entrypoint.sh"] -CMD ["-cmd", "exec", "-cfg", "config.ini", "-local", "$TERMINOLOGY_CACHE"] +CMD ["-cmd", "exec", "-cfg", "/config/config.ini", "-local", "$TERMINOLOGY_CACHE"] diff --git a/config/config.ini b/config/config.ini new file mode 100644 index 000000000..dff35689b --- /dev/null +++ b/config/config.ini @@ -0,0 +1,6 @@ +[config] +zero=https://storage.googleapis.com/tx-fhir-org +version=* +user=jose + +[web] From 755ab861f76f8a38baa3f29f75c1aa905a3062a6 Mon Sep 17 00:00:00 2001 From: Jose Costa Teixeira Date: Sun, 11 Jun 2023 17:13:05 +0200 Subject: [PATCH 14/20] reduce server binary size on linux --- build/linux-fhirserver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/linux-fhirserver.sh b/build/linux-fhirserver.sh index 4550efc2e..6abc613ac 100755 --- a/build/linux-fhirserver.sh +++ b/build/linux-fhirserver.sh @@ -53,5 +53,5 @@ echo "## compile toolkit" $BUILD/tools/lazarus/lazbuild toolkit2/fhirtoolkit.lpr --build-mode=linux -q -q echo "## compile server" -$BUILD/tools/lazarus/lazbuild server/fhirserver.lpr --build-mode=linux -q -q +$BUILD/tools/lazarus/lazbuild server/fhirserver.lpr --build-mode=linux -q -q -O2 -Xs -Flto From 829462fce71685296ab34015960dea807a463f3d Mon Sep 17 00:00:00 2001 From: Jose Costa Teixeira Date: Sun, 11 Jun 2023 18:02:14 +0200 Subject: [PATCH 15/20] Update linux-fhirserver.sh --- build/linux-fhirserver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/linux-fhirserver.sh b/build/linux-fhirserver.sh index 6abc613ac..f18ef9f59 100755 --- a/build/linux-fhirserver.sh +++ b/build/linux-fhirserver.sh @@ -53,5 +53,5 @@ echo "## compile toolkit" $BUILD/tools/lazarus/lazbuild toolkit2/fhirtoolkit.lpr --build-mode=linux -q -q echo "## compile server" -$BUILD/tools/lazarus/lazbuild server/fhirserver.lpr --build-mode=linux -q -q -O2 -Xs -Flto +$BUILD/tools/lazarus/lazbuild server/fhirserver.lpr --build-mode=linux -q -Xs -Flto From bef6a96b57418a95e7e3cb3b7751365292b6c2c7 Mon Sep 17 00:00:00 2001 From: Jose Costa Teixeira Date: Sun, 11 Jun 2023 18:31:23 +0200 Subject: [PATCH 16/20] Update linux-fhirserver.sh --- build/linux-fhirserver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/linux-fhirserver.sh b/build/linux-fhirserver.sh index f18ef9f59..c4ebccb96 100755 --- a/build/linux-fhirserver.sh +++ b/build/linux-fhirserver.sh @@ -53,5 +53,5 @@ echo "## compile toolkit" $BUILD/tools/lazarus/lazbuild toolkit2/fhirtoolkit.lpr --build-mode=linux -q -q echo "## compile server" -$BUILD/tools/lazarus/lazbuild server/fhirserver.lpr --build-mode=linux -q -Xs -Flto +$BUILD/tools/lazarus/lazbuild server/fhirserver.lpr --build-mode=linux -q --compiler-params="-O2 -Xs -Flto" From 273cecacfcd75ed9ce5db05a1cbdedc7cb6e7e55 Mon Sep 17 00:00:00 2001 From: Jose Costa Teixeira Date: Sun, 11 Jun 2023 18:54:13 +0200 Subject: [PATCH 17/20] Update linux-fhirserver.sh --- build/linux-fhirserver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/linux-fhirserver.sh b/build/linux-fhirserver.sh index c4ebccb96..4550efc2e 100755 --- a/build/linux-fhirserver.sh +++ b/build/linux-fhirserver.sh @@ -53,5 +53,5 @@ echo "## compile toolkit" $BUILD/tools/lazarus/lazbuild toolkit2/fhirtoolkit.lpr --build-mode=linux -q -q echo "## compile server" -$BUILD/tools/lazarus/lazbuild server/fhirserver.lpr --build-mode=linux -q --compiler-params="-O2 -Xs -Flto" +$BUILD/tools/lazarus/lazbuild server/fhirserver.lpr --build-mode=linux -q -q From 58dcf492665b1a025e7937725fd8ae548a5bfd75 Mon Sep 17 00:00:00 2001 From: Jose Costa Teixeira Date: Sun, 11 Jun 2023 19:02:46 +0200 Subject: [PATCH 18/20] Update fhirserver.lpi --- server/fhirserver.lpi | 1 + 1 file changed, 1 insertion(+) diff --git a/server/fhirserver.lpi b/server/fhirserver.lpi index 862d871a7..210cdf98d 100644 --- a/server/fhirserver.lpi +++ b/server/fhirserver.lpi @@ -168,6 +168,7 @@ + -O2 -Xs From 4d6316536aebad8817c7b8afb71288b7748570f7 Mon Sep 17 00:00:00 2001 From: Jose Costa Teixeira Date: Sun, 11 Jun 2023 19:46:29 +0200 Subject: [PATCH 19/20] Update fhirtoolkit.lpi --- toolkit2/fhirtoolkit.lpi | 1 + 1 file changed, 1 insertion(+) diff --git a/toolkit2/fhirtoolkit.lpi b/toolkit2/fhirtoolkit.lpi index b4088df07..cbf1aef44 100644 --- a/toolkit2/fhirtoolkit.lpi +++ b/toolkit2/fhirtoolkit.lpi @@ -118,6 +118,7 @@ + -O2 -Xs From 8fbfcb6a5c6050aeebfcedd435a973ad6151f456 Mon Sep 17 00:00:00 2001 From: Jose Costa Teixeira Date: Sun, 11 Jun 2023 21:17:33 +0200 Subject: [PATCH 20/20] reduce layers in docker and reduce bin size --- Dockerfile | 10 ++++++---- server/fhirconsole.lpi | 3 +++ utilities/codescan/codescan.lpi | 3 +++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6f02f5b09..ee737bdf9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,10 +19,12 @@ RUN /work/bootstrap/linux-toolchain.sh /work/bootstrap WORKDIR /work/fhirserver COPY . /work/fhirserver -RUN /work/bootstrap/linux-libraries.sh /work/bootstrap -RUN cp exec/pack/linux/*.so /usr/lib/ -RUN /work/fhirserver/build/linux-fhirserver.sh /work/bootstrap -RUN cp exec/pack/*.properties exec/64 +RUN /work/bootstrap/linux-libraries.sh /work/bootstrap && \ + cp exec/pack/linux/*.so /usr/lib/ +RUN /work/fhirserver/build/linux-fhirserver.sh /work/bootstrap && \ + cp exec/pack/*.properties exec/64 && \ + find . -name "*.o" -type f -delete -o -name "*.ppu" -type f -delete + ENV DISPLAY :99 ENV PORT 80 diff --git a/server/fhirconsole.lpi b/server/fhirconsole.lpi index df3c0694d..1016b41e4 100644 --- a/server/fhirconsole.lpi +++ b/server/fhirconsole.lpi @@ -143,6 +143,9 @@ + + -O2 -Xs + diff --git a/utilities/codescan/codescan.lpi b/utilities/codescan/codescan.lpi index 6063e96a2..6576e515e 100644 --- a/utilities/codescan/codescan.lpi +++ b/utilities/codescan/codescan.lpi @@ -53,6 +53,9 @@ + + -O2 -Xs +