Linuxscripts

.github/workflows/linux-docker-build.yml

@@ -4,19 +4,20 @@ on:
   push:
     branches:
       - master
-#  pull_request:
+      - linuxscripts
+  pull_request:
 jobs:
   Build-Docker-Image:
     runs-on: ubuntu-latest
     steps:
     - name: Check out repository code
       uses: actions/checkout@v2
-    -
-      name: Login to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}      
+#    -
+#      name: Login to Docker Hub
+#      uses: docker/login-action@v2
+#      with:
+#        username: ${{ secrets.DOCKERHUB_USERNAME }}
+#        password: ${{ secrets.DOCKERHUB_TOKEN }}      
     - name: Cache terminology files
       uses: actions/cache@v2
       with:
@@ -41,7 +42,6 @@ jobs:
         .
 #    - name: Scan Code
 #      run: |
-#        export DISPLAY=0:0
 #        docker run --entrypoint /work/fhirserver/utilities/codescan/codescan fhirserver /work/bootstrap
     - name: Prepare ini file
       env:

Dockerfile

@@ -42,6 +42,14 @@ RUN cp /usr/local/lib/*.so* /usr/lib/
 RUN /work/fhirserver/build/linux-fhirserver.sh /work/bootstrap
 RUN cp exec/pack/*.properties exec/64
 
+# Install curl for the health check
+RUN apt-get update && apt-get install -y curl
+
+# Set the health check
+HEALTHCHECK --interval=1m --timeout=10s --retries=5 \
+  CMD curl -f http://localhost:${PORT}/fhir/metadata || exit 1
+
+# Set the environment variables
 ENV DISPLAY :99
 ENV PORT 80
 ENV TERMINOLOGY_CACHE /terminology

build/linux-fhirserver.sh

@@ -3,6 +3,7 @@
 set -e
 
 BUILD=${1:-"/tmp/fsbuild"}
+OPENSSL_DIR=${OPENSSL_DIR:-"/tmp/openssl"}
 
 mkdir -p exec/64/
 cp exec/pack/*.cfg exec/pack/*.dat exec/64/
@@ -11,16 +12,17 @@ cp exec/pack/*.cfg exec/pack/*.dat exec/64/
 echo compile libraries
 
 echo "## compile packages/fhir_fsl.lpk"
-$BUILD/tools/lazarus/lazbuild packages/fhir_fsl.lpk -q -q  --build-all
+
+$BUILD/tools/lazarus/lazbuild packages/fhir_fsl.lpk -q -q --build-all
 
 echo "## compile packages/fhir_indy.lpk"
-$BUILD/tools/lazarus/lazbuild packages/fhir_indy.lpk -q -q  --build-all
+$BUILD/tools/lazarus/lazbuild packages/fhir_indy.lpk -q -q --build-all
 
 echo "## compile packages/fcomp.lpk"
-$BUILD/tools/lazarus/lazbuild packages/fcomp.lpk -q -q  --build-all
+$BUILD/tools/lazarus/lazbuild packages/fcomp.lpk -q -q --build-all
 
 echo "## compile packages/fhir.lpk"
-$BUILD/tools/lazarus/lazbuild packages/fhir.lpk -q -q  --build-all
+$BUILD/tools/lazarus/lazbuild packages/fhir.lpk -q -q --build-all
 
 echo "## compile packages/fhir2.lpk"
 $BUILD/tools/lazarus/lazbuild packages/fhir2.lpk -q -q --build-all
@@ -44,7 +46,8 @@ echo "## compile packages/fhir_fui.lpk"
 $BUILD/tools/lazarus/lazbuild packages/fhir_fui.lpk -q -q --build-all
 
 echo "## compile codescanner"
-echo $BUILD/tools/lazarus/lazbuild utilities/codescan/codescan.lpi --build-mode=linux -q -q --build-all
+$BUILD/tools/lazarus/lazbuild utilities/codescan/codescan.lpi --build-mode=linux -q -q --build-all
+
 
 echo "## compile console"
 $BUILD/tools/lazarus/lazbuild server/fhirconsole.lpi --build-mode=linux -q -q --build-all

build/linux-libraries.sh

@@ -5,10 +5,24 @@ echo "Updating dependencies for linux"
 # ---- initial set up ----------
 
 BUILDDIR=${1:-"/tmp/fsbuild"}
+OPENSSL_DIR=${OPENSSL_DIR:-"/tmp/openssl"}
+
 mkdir -p $BUILDDIR
-pushd $BUILDDIR
+mkdir -p $OPENSSL_DIR
+
+# Download and build OpenSSL 1.1.1w
+cd /tmp
+wget https://www.openssl.org/source/openssl-1.1.1w.tar.gz
+tar -xf openssl-1.1.1w.tar.gz
+cd openssl-1.1.1w
+./config --prefix=$OPENSSL_DIR --openssldir=$OPENSSL_DIR
+make 
+make test 
+make install
 
+pushd $BUILDDIR
 mkdir source
+
 cd source
 
 echo "## git tzdb"

build/linux-toolchain.sh

@@ -5,6 +5,8 @@ echo "Preparing dependencies for linux"
 # ---- initial set up ----------
 
 BUILDDIR=${1:-"/tmp/fsbuild"}
+OPENSSL_DIR=${OPENSSL_DIR:-"/tmp/openssl"}
+
 mkdir -p $BUILDDIR
 pushd $BUILDDIR
 

build/linux.sh

@@ -4,7 +4,19 @@
 
 BASEDIR=$(dirname "$0")
 BUILDDIR=${1:-"/tmp/fsbuild"}
+OPENSSL_DIR=${OPENSSL_DIR:-"/tmp/openssl"}
 
+export OPENSSL_DIR
+
+mkdir -p $OPENSSL_DIR
+sudo mkdir /7Zip
+sudo chmod 777 /7Zip
+
+# export PATH=$OPENSSL_DIR/bin:$PATH
+# export LD_LIBRARY_PATH=$OPENSSL_DIR:$LD_LIBRARY_PATH
+# export PKG_CONFIG_PATH=$OPENSSL_DIR/pkgconfig:$PKG_CONFIG_PATH
+
+# $BASEDIR/linux-dependencies.sh $BUILDDIR;
 $BASEDIR/linux-toolchain.sh $BUILDDIR;
 $BASEDIR/linux-libraries.sh $BUILDDIR;
 $BASEDIR/linux-fhirserver.sh $BUILDDIR;

build/windows-fhirserver.bat

@@ -12,6 +12,8 @@ copy ..\exec\pack\*.cfg ..\exec\64\
 copy ..\exec\pack\*.dat ..\exec\64\
 copy ..\exec\pack\w64\*.dll ..\exec\64\
 
+del ..\exec\64\*.exe 
+
 IF %1.==. GOTO No1
 set "tmp=%1"
 
@@ -79,6 +81,13 @@ echo ## compile server
 echo ## compile toolkit
 %tmp%\tools\lazarus\lazbuild.exe toolkit2/fhirtoolkit.lpr --build-mode=win64-release -q -q --build-all
 
-copy exec\64\*.exe "C:\Users\graha\Health Intersections Dropbox\Health Intersections Team Folder\executables\win64"
-
+IF EXIST "C:\Users\graha\Health Intersections Dropbox\Health Intersections Team Folder\fhirserver\win64" (    
+  copy exec\64\*.exe "C:\Users\graha\Health Intersections Dropbox\Health Intersections Team Folder\fhirserver\win64"
+}
+
+IF EXIST exec\64\fhirserver.exe (
+    echo Sucess!
+) ELSE (
+    echo Failed (no server executable found)
+)
 chdir /d %FSDIR% 

build/windows-release.bat

@@ -65,7 +65,7 @@ del release-notes-old.md 1>nul
 echo ## build FHIRConsole ## 
 call clean 1>nul
 utilities\codescan\codescan.exe -proj-version c:\work\fhirserver\server\fhirconsole.lpi -version %1 -debug false || goto :error
-%tmp%\tools\lazarus\lazbuild.exe -B server\fhirconsole.lpi --build-mode=win64-release -q -q
+%tmp%\tools\lazarus\lazbuild.exe -B server\fhirconsole.lpi --build-mode=win64-release -q -q --build-all
 utilities\codescan\codescan.exe -check exec\64\fhirconsole.exe -message "Building the console failed" || goto :error
 
 :: =========================================================================================
@@ -96,7 +96,7 @@ utilities\codescan\codescan.exe -check exec\64\fhirserver.exe -message "Building
 echo ## build FHIRToolkit ##
 call clean 1>nul
 utilities\codescan\codescan.exe -proj-version toolkit2\fhirtoolkit.lpi -version %1 -debug false || goto :error
-%tmp%\tools\lazarus\lazbuild.exe -B toolkit2\fhirtoolkit.lpi --build-mode=win64-release -q -q
+%tmp%\tools\lazarus\lazbuild.exe -B toolkit2\fhirtoolkit.lpi --build-mode=win64-release -q -q --build-all
 utilities\codescan\codescan.exe -check exec\64\fhirtoolkit.exe -message "Building the toolkit failed" || goto :error
 
 echo All compile done

build/windows-update.bat

@@ -12,8 +12,8 @@ set "tmp=%1"
 
 :No1
 
-call windows-libraries.bat %tmp%
+call build\windows-libraries.bat %tmp%
 pause
 
-call windows-fhirserver.bat %tmp%
+call build\windows-fhirserver.bat %tmp%
 pause