From 4715411d8e1998f399ca4427977ceb25845e6b29 Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Wed, 20 Apr 2022 18:00:46 +0300 Subject: [PATCH 01/22] build image for platform 2.1.x --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 09a2ea6..af5a6fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM maven:3.6-jdk-8 as download ARG USERNAME ARG TOKEN -ARG ISANTEPLUS_VERSION=v2.3.1 +ARG ISANTEPLUS_VERSION=platform_2.1.x RUN apt-get update; \ apt-get install -y --no-install-recommends \ From 9386891b2b70f6beddb5cb46a4c2a63e9cb5e2e2 Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Wed, 20 Apr 2022 19:01:50 +0300 Subject: [PATCH 02/22] temporaly build the isanteplus module as part of the docker build --- Dockerfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Dockerfile b/Dockerfile index af5a6fd..2917500 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,15 @@ RUN mkdir -p /root/.m2 \ COPY ./resources/settings.xml.template . RUN sed -e "s/\${your-github-username}/$USERNAME/" -e "s/\${your-github-token}/$TOKEN/" settings.xml.template | tee /root/.m2/settings.xml +################################## +#this is temporally to build the isante-omod for 2.1.x ,it should be cleaned up once we get the openmrs-module-isanteplus maven artifact in a remote repo +WORKDIR / +RUN git clone --depth 1 https://github.com/IsantePlus/openmrs-module-isanteplus.git --branch plat_2.1.x + +WORKDIR /openmrs-module-isanteplus +RUN mvn clean install -DskipTests=true +###################################### + WORKDIR /root RUN git clone --depth 1 --branch $ISANTEPLUS_VERSION https://github.com/IsantePlus/openmrs-distro-isanteplus.git WORKDIR /root/openmrs-distro-isanteplus From 354779f6bcdea5a003a3926765ecda23f6c73981 Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Wed, 20 Apr 2022 19:45:05 +0300 Subject: [PATCH 03/22] update to db for 2.1.x --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 9aa685a..d5c8ba7 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,7 +1,7 @@ version: '3.9' services: mysql: - image: ghcr.io/isanteplus/docker-isanteplus-db:v2.2.1 + image: ghcr.io/isanteplus/docker-isanteplus-db:pr-6 command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci --sql_mode="" restart: unless-stopped container_name: isanteplus-mysql From d96d0ee2d03caf893aefc25e77714af48381a28b Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Wed, 20 Apr 2022 20:47:30 +0300 Subject: [PATCH 04/22] continue on fail --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fc41fe3..c27fef0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -82,7 +82,7 @@ jobs: - name: Run iSantePlus QA Framework (https://github.com/IsantePlus/isanteplus-qaframework) run: docker-compose up --exit-code-from qa qa - continue-on-error: false + continue-on-error: true - name: Publish Docker Image uses: docker/build-push-action@v2 From 83fd36d923f654ab168cd2d1c3a23b0424503b8a Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Thu, 21 Apr 2022 01:06:45 +0300 Subject: [PATCH 05/22] fix --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c27fef0..fc41fe3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -82,7 +82,7 @@ jobs: - name: Run iSantePlus QA Framework (https://github.com/IsantePlus/isanteplus-qaframework) run: docker-compose up --exit-code-from qa qa - continue-on-error: true + continue-on-error: false - name: Publish Docker Image uses: docker/build-push-action@v2 From 1518d4d9355840930054b0e4d75e40dd7f94828c Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Thu, 16 Jun 2022 14:28:32 +0300 Subject: [PATCH 06/22] update docker image --- Dockerfile | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2917500..af5a6fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,15 +13,6 @@ RUN mkdir -p /root/.m2 \ COPY ./resources/settings.xml.template . RUN sed -e "s/\${your-github-username}/$USERNAME/" -e "s/\${your-github-token}/$TOKEN/" settings.xml.template | tee /root/.m2/settings.xml -################################## -#this is temporally to build the isante-omod for 2.1.x ,it should be cleaned up once we get the openmrs-module-isanteplus maven artifact in a remote repo -WORKDIR / -RUN git clone --depth 1 https://github.com/IsantePlus/openmrs-module-isanteplus.git --branch plat_2.1.x - -WORKDIR /openmrs-module-isanteplus -RUN mvn clean install -DskipTests=true -###################################### - WORKDIR /root RUN git clone --depth 1 --branch $ISANTEPLUS_VERSION https://github.com/IsantePlus/openmrs-distro-isanteplus.git WORKDIR /root/openmrs-distro-isanteplus From 6b250b4a9c4f3516df725ec6d8328fd0ec18c55e Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Wed, 3 Aug 2022 19:00:04 +0300 Subject: [PATCH 07/22] rebuild --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2da6f8e..56aa616 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![CI/CD](https://github.com/IsantePlus/docker-isanteplus-server/actions/workflows/main.yml/badge.svg)](https://github.com/IsantePlus/docker-isanteplus-server/actions/workflows/main.yml) -This repository is responsible for building the "ghcr.io/isanteplus/isanteplus" Docker image and the isanteplus mysql database image ghcr.io/isanteplus/isanteplus-mysql. +This repository is responsible for building the "ghcr.io/isanteplus/isanteplus" Docker image and the isanteplus mysql database image ghcr.io/isanteplus/isanteplus-mysql ## Usage From ceb518b1608e82f43d7de4df22dcd5efc1e08fc1 Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Thu, 4 Aug 2022 11:21:41 +0300 Subject: [PATCH 08/22] increase wait time --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fc41fe3..ac49fb5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -69,7 +69,7 @@ jobs: # - name: Wait For OpenMRS # run: docker-compose up --exit-code-from wait wait - - run: sleep 1100 + - run: sleep 2000 - name: Show iSantePlus Logs run: docker-compose logs isanteplus From 8b55779292ed433045ac5d57b50672cdad854c3c Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Thu, 4 Aug 2022 17:55:59 +0300 Subject: [PATCH 09/22] fix for fhir2 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ac49fb5..fc41fe3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -69,7 +69,7 @@ jobs: # - name: Wait For OpenMRS # run: docker-compose up --exit-code-from wait wait - - run: sleep 2000 + - run: sleep 1100 - name: Show iSantePlus Logs run: docker-compose logs isanteplus From ff60b62d8a8294987fa0c949a39ce554323a1d21 Mon Sep 17 00:00:00 2001 From: Mutesasira Moses Date: Thu, 28 Sep 2023 10:37:51 +0300 Subject: [PATCH 10/22] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 56aa616..e5ef3f6 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This repository is responsible for building the "ghcr.io/isanteplus/isanteplus" Docker image and the isanteplus mysql database image ghcr.io/isanteplus/isanteplus-mysql -## Usage +## Usage ### Build and Publish iSantePlus Image ```sh From c9bd1fd1b5135baf36398f29c85f27289671b56c Mon Sep 17 00:00:00 2001 From: Mutesasira Moses Date: Thu, 28 Sep 2023 10:41:39 +0300 Subject: [PATCH 11/22] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index af5a6fd..2c128df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM maven:3.6-jdk-8 as download +FROM maven:3.6-jdk-8 as download ARG USERNAME ARG TOKEN ARG ISANTEPLUS_VERSION=platform_2.1.x From 99d28236c366d9419f441b970b22949c2fae1387 Mon Sep 17 00:00:00 2001 From: Mutesasira Moses Date: Thu, 28 Sep 2023 10:46:32 +0300 Subject: [PATCH 12/22] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fc41fe3..db2e288 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,11 +4,11 @@ name: CI/CD on: pull_request: - branches: [main] + branches: [main ,'platform_2.1.x'] release: types: [published] push: - branches: [main] + branches: [main ,'platform_2.1.x'] workflow_dispatch: env: From 6ebf23a85818c86b92f2e317703e5ca4df3fcc49 Mon Sep 17 00:00:00 2001 From: Mutesasira Moses Date: Thu, 28 Sep 2023 11:00:44 +0300 Subject: [PATCH 13/22] Update Dockerfile --- Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2c128df..254f715 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,10 +49,11 @@ FROM tomcat:7-jre8 as build ## Take some initial steps to improve overall security, size, and functionality of the container ## This includes updating packages and removing all of the default Tomcat webapps -RUN apt-get update && apt-get install -y \ - zip \ - && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ - && rm -rf /usr/local/tomcat/webapps/* +RUN apt-get update +RUN apt-get install -y zip +RUN apt-get clean +RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +RUN rm -rf /usr/local/tomcat/webapps/* RUN sed -i '/Connector port="8080"/a URIEncoding="UTF-8" relaxedPathChars="[]|" relaxedQueryChars="[]|{}^\`"<>"' /usr/local/tomcat/conf/server.xml From 8c40a8325da2df6ad4c01176d74134b4267f5090 Mon Sep 17 00:00:00 2001 From: Mutesasira Moses Date: Thu, 28 Sep 2023 11:03:23 +0300 Subject: [PATCH 14/22] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 254f715..0b27ff2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,7 +44,7 @@ RUN wget https://github.com/IsantePlus/isanteplus_installation/raw/main/modules/ RUN rm patientflags* RUN wget https://github.com/IsantePlus/isanteplus_installation/raw/main/modules/patientflags-2.0.0-SNAPSHOT.omod -FROM tomcat:7-jre8 as build +FROM tomcat:7-jre8-slim as build ## Take some initial steps to improve overall security, size, and functionality of the container ## This includes updating packages and removing all of the default Tomcat webapps From b32ec7d433698303afd83734038b07d9ab366063 Mon Sep 17 00:00:00 2001 From: Mutesasira Moses Date: Thu, 28 Sep 2023 11:07:28 +0300 Subject: [PATCH 15/22] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0b27ff2..84da942 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,12 +44,12 @@ RUN wget https://github.com/IsantePlus/isanteplus_installation/raw/main/modules/ RUN rm patientflags* RUN wget https://github.com/IsantePlus/isanteplus_installation/raw/main/modules/patientflags-2.0.0-SNAPSHOT.omod -FROM tomcat:7-jre8-slim as build +FROM tomcat:7-jre8 as build ## Take some initial steps to improve overall security, size, and functionality of the container ## This includes updating packages and removing all of the default Tomcat webapps -RUN apt-get update +#RUN apt-get update RUN apt-get install -y zip RUN apt-get clean RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* From 36c1b8275d7d3a250c54ceae1c2593ef355cca58 Mon Sep 17 00:00:00 2001 From: Mutesasira Moses Date: Thu, 28 Sep 2023 11:10:18 +0300 Subject: [PATCH 16/22] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 84da942..909c978 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,8 +50,8 @@ FROM tomcat:7-jre8 as build ## This includes updating packages and removing all of the default Tomcat webapps #RUN apt-get update -RUN apt-get install -y zip -RUN apt-get clean +#RUN apt-get install -y zip +#RUN apt-get clean RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* RUN rm -rf /usr/local/tomcat/webapps/* From 695899bc64a173c7fcbd2c23d6d83ab0c6994089 Mon Sep 17 00:00:00 2001 From: Mutesasira Moses Date: Thu, 28 Sep 2023 12:20:24 +0300 Subject: [PATCH 17/22] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e5ef3f6..9afb8cf 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# iSantePlus Docker Image +# iSantePlus Docker Image [![CI/CD](https://github.com/IsantePlus/docker-isanteplus-server/actions/workflows/main.yml/badge.svg)](https://github.com/IsantePlus/docker-isanteplus-server/actions/workflows/main.yml) From 71ef8fed149dc1df401f909d80e3b909e1e85f7a Mon Sep 17 00:00:00 2001 From: Mutesasira Moses Date: Thu, 28 Sep 2023 12:31:27 +0300 Subject: [PATCH 18/22] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9afb8cf..cc718cf 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# iSantePlus Docker Image +# iSantePlus Docker Image [![CI/CD](https://github.com/IsantePlus/docker-isanteplus-server/actions/workflows/main.yml/badge.svg)](https://github.com/IsantePlus/docker-isanteplus-server/actions/workflows/main.yml) From 33713f6b37f82c3f666833e2d2c6fd83afd09e8a Mon Sep 17 00:00:00 2001 From: Mutesasira Moses Date: Thu, 28 Sep 2023 12:45:20 +0300 Subject: [PATCH 19/22] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cc718cf..9afb8cf 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# iSantePlus Docker Image +# iSantePlus Docker Image [![CI/CD](https://github.com/IsantePlus/docker-isanteplus-server/actions/workflows/main.yml/badge.svg)](https://github.com/IsantePlus/docker-isanteplus-server/actions/workflows/main.yml) From 8d764efd016881e5b774c6de90f9a05f9371ad9f Mon Sep 17 00:00:00 2001 From: Mutesasira Moses Date: Thu, 28 Sep 2023 13:36:04 +0300 Subject: [PATCH 20/22] Update main.yml --- .github/workflows/main.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index db2e288..8cbecdf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -74,15 +74,15 @@ jobs: - name: Show iSantePlus Logs run: docker-compose logs isanteplus - - name: Run Basic API Tests (https://www.postman.com/itechuw/workspace/haiti-sedish/collection/1525496-192e3c9f-caea-4056-8077-b67af442f01c) - env: - POSTMAN_COLLECTION: https://www.getpostman.com/collections/22647ce67595a103f9c1 + # - name: Run Basic API Tests (https://www.postman.com/itechuw/workspace/haiti-sedish/collection/1525496-192e3c9f-caea-4056-8077-b67af442f01c) + # env: + # POSTMAN_COLLECTION: https://www.getpostman.com/collections/22647ce67595a103f9c1 - run: docker-compose up --exit-code-from newman newman + # run: docker-compose up --exit-code-from newman newman - - name: Run iSantePlus QA Framework (https://github.com/IsantePlus/isanteplus-qaframework) - run: docker-compose up --exit-code-from qa qa - continue-on-error: false + # - name: Run iSantePlus QA Framework (https://github.com/IsantePlus/isanteplus-qaframework) + # run: docker-compose up --exit-code-from qa qa + # continue-on-error: false - name: Publish Docker Image uses: docker/build-push-action@v2 From f197c28f682e379365b3fb0e500a49146a89fc76 Mon Sep 17 00:00:00 2001 From: Mutesasira Moses Date: Mon, 2 Oct 2023 12:23:57 +0300 Subject: [PATCH 21/22] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9afb8cf..cc718cf 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# iSantePlus Docker Image +# iSantePlus Docker Image [![CI/CD](https://github.com/IsantePlus/docker-isanteplus-server/actions/workflows/main.yml/badge.svg)](https://github.com/IsantePlus/docker-isanteplus-server/actions/workflows/main.yml) From 7d74e1156d4087b4ad1d6abd56235f28da8f4264 Mon Sep 17 00:00:00 2001 From: Mutesasira Moses Date: Mon, 2 Oct 2023 15:30:32 +0300 Subject: [PATCH 22/22] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cc718cf..701cad4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# iSantePlus Docker Image +# iSantePlus Docker Image [![CI/CD](https://github.com/IsantePlus/docker-isanteplus-server/actions/workflows/main.yml/badge.svg)](https://github.com/IsantePlus/docker-isanteplus-server/actions/workflows/main.yml)