From 382cfc9b27052b670a5a0960da96d0842f5edde9 Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Wed, 20 Apr 2022 18:29:19 +0300 Subject: [PATCH 01/10] run isante on platform_2.1.x --- Dockerfile | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5939ab9..194273c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM maven:3.6-jdk-8 as download WORKDIR / -ARG ISANTEPLUS_VERSION=v2.2.1 +ARG ISANTEPLUS_VERSION=platform_2.1.x RUN git clone --depth 1 --branch $ISANTEPLUS_VERSION https://github.com/IsantePlus/openmrs-distro-isanteplus.git @@ -12,9 +12,28 @@ WORKDIR /openmrs-distro-isanteplus RUN mvn generate-resources +WORKDIR / + +RUN git clone --depth 1 https://github.com/IsantePlus/etlscript.git + WORKDIR /db -RUN mv /openmrs-distro-isanteplus/package/src/main/resources/openmrs-distro.sql /db +# rename the files with numbers to control the order of execution +RUN mv /openmrs-distro-isanteplus/package/src/main/resources/openmrs-distro.sql /db/1.sql + +RUN mv /etlscript/sql_files/isanteplusreportsddlscript.sql /db/2.sql + +RUN mv /etlscript/sql_files/isanteplusreportsdmlscript.sql /db/3.sql + +RUN mv /etlscript/sql_files/drug_lookup_isanteplus.sql /db/4.sql + +RUN mv /etlscript/sql_files/run_isante_patient_status.sql /db/5.sql + +RUN mv /etlscript/sql_files/insertion_obs_by_day.sql /db/6.sql + +RUN mv /etlscript/sql_files/patient_status_arv_dml.sql /db/7.sql + +RUN mv /etlscript/sql_files/indicators_report.sql /db/8.sql FROM debian:buster-slim as db From 86ae76ecbe5fea2adec160a6665d9502ca087e5e Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Thu, 21 Apr 2022 00:47:47 +0300 Subject: [PATCH 02/10] remove etl scripts --- Dockerfile | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index 194273c..d89d041 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,28 +12,9 @@ WORKDIR /openmrs-distro-isanteplus RUN mvn generate-resources -WORKDIR / - -RUN git clone --depth 1 https://github.com/IsantePlus/etlscript.git - WORKDIR /db -# rename the files with numbers to control the order of execution -RUN mv /openmrs-distro-isanteplus/package/src/main/resources/openmrs-distro.sql /db/1.sql - -RUN mv /etlscript/sql_files/isanteplusreportsddlscript.sql /db/2.sql - -RUN mv /etlscript/sql_files/isanteplusreportsdmlscript.sql /db/3.sql - -RUN mv /etlscript/sql_files/drug_lookup_isanteplus.sql /db/4.sql - -RUN mv /etlscript/sql_files/run_isante_patient_status.sql /db/5.sql - -RUN mv /etlscript/sql_files/insertion_obs_by_day.sql /db/6.sql - -RUN mv /etlscript/sql_files/patient_status_arv_dml.sql /db/7.sql - -RUN mv /etlscript/sql_files/indicators_report.sql /db/8.sql +RUN mv /openmrs-distro-isanteplus/package/src/main/resources/openmrs-distro.sql /db/ FROM debian:buster-slim as db From 38cffcb2ce288eb843058883c1f3b64fa85b4c90 Mon Sep 17 00:00:00 2001 From: Mutesasira Moses Date: Fri, 29 Sep 2023 12:59:31 +0300 Subject: [PATCH 03/10] Update build-and-deploy.yml --- .github/workflows/build-and-deploy.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 19c3bf6..d9f1555 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -6,11 +6,9 @@ on: release: types: [published] push: - branches: - - "main" + branches: [main,'platform_2.1.x'] pull_request: - branches: - - "main" + branches: [main,'platform_2.1.x'] workflow_dispatch: env: @@ -50,4 +48,4 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=registry,ref=user/app:latest - cache-to: type=inline \ No newline at end of file + cache-to: type=inline From a0d76f124135c4872f7360fb35e1d69df7bf790a Mon Sep 17 00:00:00 2001 From: Mutesasira Moses Date: Mon, 2 Oct 2023 12:48:26 +0300 Subject: [PATCH 04/10] Update Dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index d89d041..0d436d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex; \ apt-key list > /dev/null ENV MYSQL_MAJOR 5.7 -ENV MYSQL_VERSION 5.7.37-1debian10 +ENV MYSQL_VERSION 5.7.37-0ubuntu0.18.04.1 RUN echo 'deb http://repo.mysql.com/apt/debian/ buster mysql-5.7' > /etc/apt/sources.list.d/mysql.list @@ -91,7 +91,7 @@ RUN { \ } | debconf-set-selections \ && apt-get update \ && apt-get install -y \ - mysql-server="${MYSQL_VERSION}" \ + mysql-server-5.7="${MYSQL_VERSION}" \ # comment out a few problematic configuration values && find /etc/mysql/ -name '*.cnf' -print0 \ | xargs -0 grep -lZE '^(bind-address|log)' \ @@ -116,4 +116,4 @@ RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat ENTRYPOINT ["docker-entrypoint.sh"] EXPOSE 3306 33060 -CMD ["mysqld"] \ No newline at end of file +CMD ["mysqld"] From e185ad76b19476c3e55b16c652cbad991ef6229e Mon Sep 17 00:00:00 2001 From: Mutesasira Moses Date: Tue, 3 Oct 2023 18:10:46 +0300 Subject: [PATCH 05/10] Update Dockerfile --- Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0d436d5..1cfa89a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -78,8 +78,12 @@ RUN set -ex; \ ENV MYSQL_MAJOR 5.7 ENV MYSQL_VERSION 5.7.37-0ubuntu0.18.04.1 - -RUN echo 'deb http://repo.mysql.com/apt/debian/ buster mysql-5.7' > /etc/apt/sources.list.d/mysql.list +RUN apt update +RUN apt install software-properties-common +#RUN echo 'deb http://repo.mysql.com/apt/debian/ buster mysql-5.7' > /etc/apt/sources.list.d/mysql.list +RUN add-apt-repository 'deb http://repo.mysql.com/apt/ubuntu/ bionic mysql-5.7' +RUN wget https://dev.mysql.com/get/mysql-apt-config_0.8.17-1_all.deb +RUN dpkg -i mysql-apt-config_0.8.17-1_all.deb # the "/var/lib/mysql" stuff here is because the mysql-server postinst doesn't have an explicit way to disable the mysql_install_db codepath besides having a database already "configured" (ie, stuff in /var/lib/mysql/mysql) # also, we set debconf keys to make APT a little quieter @@ -91,7 +95,7 @@ RUN { \ } | debconf-set-selections \ && apt-get update \ && apt-get install -y \ - mysql-server-5.7="${MYSQL_VERSION}" \ + mysql-server \ # comment out a few problematic configuration values && find /etc/mysql/ -name '*.cnf' -print0 \ | xargs -0 grep -lZE '^(bind-address|log)' \ From 0fa65e1bf670d9df7963b2f46d6a76c57685147b Mon Sep 17 00:00:00 2001 From: Mutesasira Moses Date: Tue, 3 Oct 2023 18:24:19 +0300 Subject: [PATCH 06/10] Update Dockerfile --- Dockerfile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1cfa89a..5ed5a16 100644 --- a/Dockerfile +++ b/Dockerfile @@ -78,12 +78,8 @@ RUN set -ex; \ ENV MYSQL_MAJOR 5.7 ENV MYSQL_VERSION 5.7.37-0ubuntu0.18.04.1 -RUN apt update -RUN apt install software-properties-common -#RUN echo 'deb http://repo.mysql.com/apt/debian/ buster mysql-5.7' > /etc/apt/sources.list.d/mysql.list -RUN add-apt-repository 'deb http://repo.mysql.com/apt/ubuntu/ bionic mysql-5.7' -RUN wget https://dev.mysql.com/get/mysql-apt-config_0.8.17-1_all.deb -RUN dpkg -i mysql-apt-config_0.8.17-1_all.deb + +RUN echo 'deb http://repo.mysql.com/apt/debian/ buster mysql-5.7' > /etc/apt/sources.list.d/mysql.list # the "/var/lib/mysql" stuff here is because the mysql-server postinst doesn't have an explicit way to disable the mysql_install_db codepath besides having a database already "configured" (ie, stuff in /var/lib/mysql/mysql) # also, we set debconf keys to make APT a little quieter @@ -95,7 +91,7 @@ RUN { \ } | debconf-set-selections \ && apt-get update \ && apt-get install -y \ - mysql-server \ + mysql-server="${MYSQL_VERSION}" \ # comment out a few problematic configuration values && find /etc/mysql/ -name '*.cnf' -print0 \ | xargs -0 grep -lZE '^(bind-address|log)' \ From 84b7b4be0aa08beb934b89dca3c0d2f4019cdc89 Mon Sep 17 00:00:00 2001 From: Mutesasira Moses Date: Tue, 3 Oct 2023 18:28:44 +0300 Subject: [PATCH 07/10] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5ed5a16..53d3cd3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -79,7 +79,7 @@ RUN set -ex; \ ENV MYSQL_MAJOR 5.7 ENV MYSQL_VERSION 5.7.37-0ubuntu0.18.04.1 -RUN echo 'deb http://repo.mysql.com/apt/debian/ buster mysql-5.7' > /etc/apt/sources.list.d/mysql.list +RUN echo 'deb http://repo.mysql.com/apt/debian/ bionic mysql-5.7' > /etc/apt/sources.list.d/mysql.list # the "/var/lib/mysql" stuff here is because the mysql-server postinst doesn't have an explicit way to disable the mysql_install_db codepath besides having a database already "configured" (ie, stuff in /var/lib/mysql/mysql) # also, we set debconf keys to make APT a little quieter From 1535043d17272f195e3c3f74ef93799682e255c2 Mon Sep 17 00:00:00 2001 From: Mutesasira Moses Date: Tue, 3 Oct 2023 18:36:51 +0300 Subject: [PATCH 08/10] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 53d3cd3..2dbc8a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -77,9 +77,9 @@ RUN set -ex; \ apt-key list > /dev/null ENV MYSQL_MAJOR 5.7 -ENV MYSQL_VERSION 5.7.37-0ubuntu0.18.04.1 +ENV MYSQL_VERSION 5.7.37-1debian10 -RUN echo 'deb http://repo.mysql.com/apt/debian/ bionic mysql-5.7' > /etc/apt/sources.list.d/mysql.list +RUN echo 'deb http://repo.mysql.com/apt/debian/ buster mysql-5.7' > /etc/apt/sources.list.d/mysql.list # the "/var/lib/mysql" stuff here is because the mysql-server postinst doesn't have an explicit way to disable the mysql_install_db codepath besides having a database already "configured" (ie, stuff in /var/lib/mysql/mysql) # also, we set debconf keys to make APT a little quieter From f78f5855dd15b7f47c770dfb59538235e9b63e89 Mon Sep 17 00:00:00 2001 From: Mutesasira Moses Date: Tue, 3 Oct 2023 18:40:59 +0300 Subject: [PATCH 09/10] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2dbc8a3..7126604 100644 --- a/Dockerfile +++ b/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex; \ apt-key list > /dev/null ENV MYSQL_MAJOR 5.7 -ENV MYSQL_VERSION 5.7.37-1debian10 +ENV MYSQL_VERSION 5.7.35-0debian10 RUN echo 'deb http://repo.mysql.com/apt/debian/ buster mysql-5.7' > /etc/apt/sources.list.d/mysql.list From 10b00b81aae520472471c371f6fb247035a10ba4 Mon Sep 17 00:00:00 2001 From: Mutesasira Moses Date: Tue, 3 Oct 2023 18:55:04 +0300 Subject: [PATCH 10/10] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7126604..eaba211 100644 --- a/Dockerfile +++ b/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex; \ apt-key list > /dev/null ENV MYSQL_MAJOR 5.7 -ENV MYSQL_VERSION 5.7.35-0debian10 +ENV MYSQL_VERSION 5.7.42-1debian10 RUN echo 'deb http://repo.mysql.com/apt/debian/ buster mysql-5.7' > /etc/apt/sources.list.d/mysql.list