From bb65cfd00e48cf5d823b5776fe31653307c75235 Mon Sep 17 00:00:00 2001 From: Piotr Mankowski Date: Tue, 10 Jun 2025 09:30:57 -0400 Subject: [PATCH] Updates for core module setup --- mk.sh | 12 ++++++------ packages/emr-isanteplus/Dockerfile | 1 - .../isanteplusreports-1.1-SNAPSHOT.omod | 3 --- .../labintegration-2.2.1-SNAPSHOT.omod | 3 --- packages/emr-isanteplus/package-metadata.json | 2 +- .../emr-isanteplus/xds-sender-2.4.0-SNAPSHOT.omod | 3 --- projects/emr-isanteplus/Dockerfile | 2 ++ .../custom_modules/haiticore-1.0.0-SNAPSHOT.omod | 3 +++ .../custom_modules/isanteplus-1.3.0.omod | 3 +++ .../isanteplusreports-1.1-SNAPSHOT.omod | 3 +++ .../labintegration-2.3.3-SNAPSHOT.omod | 0 .../labintegration-2.3.7-SNAPSHOT.omod | 3 +++ .../custom_modules/m2sys-biometrics-1.0.0.omod | 3 +++ .../custom_modules/xds-sender-2.5.0-SNAPSHOT.omod | 0 .../openmrs_modules/isanteplus-1.4.2.omod | 3 --- .../openmrs_modules/isanteplus-1.4.6.omod | 3 +++ .../labintegration-2.3.7-SNAPSHOT.omod | 3 +++ 17 files changed, 30 insertions(+), 20 deletions(-) delete mode 100644 packages/emr-isanteplus/config/custom_modules/isanteplusreports-1.1-SNAPSHOT.omod delete mode 100644 packages/emr-isanteplus/config/custom_modules/labintegration-2.2.1-SNAPSHOT.omod delete mode 100644 packages/emr-isanteplus/xds-sender-2.4.0-SNAPSHOT.omod create mode 100644 projects/emr-isanteplus/distribution/custom_modules/haiticore-1.0.0-SNAPSHOT.omod create mode 100644 projects/emr-isanteplus/distribution/custom_modules/isanteplus-1.3.0.omod create mode 100644 projects/emr-isanteplus/distribution/custom_modules/isanteplusreports-1.1-SNAPSHOT.omod rename projects/emr-isanteplus/distribution/{openmrs_modules => custom_modules}/labintegration-2.3.3-SNAPSHOT.omod (100%) create mode 100644 projects/emr-isanteplus/distribution/custom_modules/labintegration-2.3.7-SNAPSHOT.omod create mode 100644 projects/emr-isanteplus/distribution/custom_modules/m2sys-biometrics-1.0.0.omod rename {packages/emr-isanteplus/config => projects/emr-isanteplus/distribution}/custom_modules/xds-sender-2.5.0-SNAPSHOT.omod (100%) delete mode 100644 projects/emr-isanteplus/distribution/openmrs_modules/isanteplus-1.4.2.omod create mode 100644 projects/emr-isanteplus/distribution/openmrs_modules/isanteplus-1.4.6.omod create mode 100644 projects/emr-isanteplus/distribution/openmrs_modules/labintegration-2.3.7-SNAPSHOT.omod diff --git a/mk.sh b/mk.sh index 824a266..fe0d686 100755 --- a/mk.sh +++ b/mk.sh @@ -1,5 +1,5 @@ -#./build-custom-images.sh -./build-image.sh +./build-custom-images.sh +#./build-image.sh #./instant project down --env-file .env #./instant project destroy --env-file .env @@ -20,10 +20,10 @@ #mysql -./instant package remove -n database-mysql --env-file .env -./instant package init -n database-mysql --env-file .env -d -# ./instant package down -n database-mysql --env-file .env -# ./instant package up -n database-mysql --env-file .env +#./instant package remove -n database-mysql --env-file .env +#./instant package init -n database-mysql --env-file .env -d +#./instant package down -n database-mysql --env-file .env +#./instant package up -n database-mysql --env-file .env # #isanteplus ./instant package remove -n emr-isanteplus --env-file .env diff --git a/packages/emr-isanteplus/Dockerfile b/packages/emr-isanteplus/Dockerfile index a30cd10..bbe0c00 100644 --- a/packages/emr-isanteplus/Dockerfile +++ b/packages/emr-isanteplus/Dockerfile @@ -1,3 +1,2 @@ from ghcr.io/isanteplus/docker-isanteplus-server:v2.3.4 -add ./config/custom_modules /custom_modules \ No newline at end of file diff --git a/packages/emr-isanteplus/config/custom_modules/isanteplusreports-1.1-SNAPSHOT.omod b/packages/emr-isanteplus/config/custom_modules/isanteplusreports-1.1-SNAPSHOT.omod deleted file mode 100644 index 00f9e90..0000000 --- a/packages/emr-isanteplus/config/custom_modules/isanteplusreports-1.1-SNAPSHOT.omod +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47a076758f69ad68a5aef3318b4428722d7357c07855605906adbc2a0bed3bbc -size 4962936 diff --git a/packages/emr-isanteplus/config/custom_modules/labintegration-2.2.1-SNAPSHOT.omod b/packages/emr-isanteplus/config/custom_modules/labintegration-2.2.1-SNAPSHOT.omod deleted file mode 100644 index 08912f5..0000000 --- a/packages/emr-isanteplus/config/custom_modules/labintegration-2.2.1-SNAPSHOT.omod +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0dd789cf4ef8f04dd20c84f412cbe19c24fc6357a8654db90ca6bec222e7dafc -size 111838 diff --git a/packages/emr-isanteplus/package-metadata.json b/packages/emr-isanteplus/package-metadata.json index 58e0ed5..15119d1 100644 --- a/packages/emr-isanteplus/package-metadata.json +++ b/packages/emr-isanteplus/package-metadata.json @@ -4,7 +4,7 @@ "description": "An OpenMRS-based EMR for Haiti", "type": "infrastructure", "version": "0.0.0", - "dependencies": ["database-mysql"], + "dependencies": [], "environmentVariables": { "OMRS_CONFIG_CONNECTION_SERVER": "mysql", "OMRS_CONFIG_CREATE_DATABASE_USER": "false", diff --git a/packages/emr-isanteplus/xds-sender-2.4.0-SNAPSHOT.omod b/packages/emr-isanteplus/xds-sender-2.4.0-SNAPSHOT.omod deleted file mode 100644 index 6e331bc..0000000 --- a/packages/emr-isanteplus/xds-sender-2.4.0-SNAPSHOT.omod +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c4f615fbef47c8a5bfbcc15333ebe2a73905197181e88ad1739c20105afbd33b -size 3966306 diff --git a/projects/emr-isanteplus/Dockerfile b/projects/emr-isanteplus/Dockerfile index 8b165a8..2e9a151 100644 --- a/projects/emr-isanteplus/Dockerfile +++ b/projects/emr-isanteplus/Dockerfile @@ -62,6 +62,8 @@ EXPOSE 8080 COPY ./entrypoint-wrapper.sh /entrypoint-wrapper.sh +#add ./distribution/custom_modules /custom_modules + RUN chmod +x /entrypoint-wrapper.sh ENTRYPOINT ls /custom_modules && /entrypoint-wrapper.sh diff --git a/projects/emr-isanteplus/distribution/custom_modules/haiticore-1.0.0-SNAPSHOT.omod b/projects/emr-isanteplus/distribution/custom_modules/haiticore-1.0.0-SNAPSHOT.omod new file mode 100644 index 0000000..24e987e --- /dev/null +++ b/projects/emr-isanteplus/distribution/custom_modules/haiticore-1.0.0-SNAPSHOT.omod @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e78894998ff083ce1f43259568594ef88606a58fc64da04cadece48623a8251 +size 483363 diff --git a/projects/emr-isanteplus/distribution/custom_modules/isanteplus-1.3.0.omod b/projects/emr-isanteplus/distribution/custom_modules/isanteplus-1.3.0.omod new file mode 100644 index 0000000..7185dd0 --- /dev/null +++ b/projects/emr-isanteplus/distribution/custom_modules/isanteplus-1.3.0.omod @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71bf19c4e3827e1ebc47a53df8e58eecc117c80b3b8c8c0d0d7886f232e9741b +size 4431886 diff --git a/projects/emr-isanteplus/distribution/custom_modules/isanteplusreports-1.1-SNAPSHOT.omod b/projects/emr-isanteplus/distribution/custom_modules/isanteplusreports-1.1-SNAPSHOT.omod new file mode 100644 index 0000000..c9e3f0a --- /dev/null +++ b/projects/emr-isanteplus/distribution/custom_modules/isanteplusreports-1.1-SNAPSHOT.omod @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97d7cb0162eac4eeb07c29f03268baa5ae3bb660a6dcdeef8edc640257b70694 +size 4966569 diff --git a/projects/emr-isanteplus/distribution/openmrs_modules/labintegration-2.3.3-SNAPSHOT.omod b/projects/emr-isanteplus/distribution/custom_modules/labintegration-2.3.3-SNAPSHOT.omod similarity index 100% rename from projects/emr-isanteplus/distribution/openmrs_modules/labintegration-2.3.3-SNAPSHOT.omod rename to projects/emr-isanteplus/distribution/custom_modules/labintegration-2.3.3-SNAPSHOT.omod diff --git a/projects/emr-isanteplus/distribution/custom_modules/labintegration-2.3.7-SNAPSHOT.omod b/projects/emr-isanteplus/distribution/custom_modules/labintegration-2.3.7-SNAPSHOT.omod new file mode 100644 index 0000000..9ca5ba4 --- /dev/null +++ b/projects/emr-isanteplus/distribution/custom_modules/labintegration-2.3.7-SNAPSHOT.omod @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b18e4e0f6fec4cd0d2dd25dafec1c35e9a21dd81239fbf524b70e948ad5f7f42 +size 126015 diff --git a/projects/emr-isanteplus/distribution/custom_modules/m2sys-biometrics-1.0.0.omod b/projects/emr-isanteplus/distribution/custom_modules/m2sys-biometrics-1.0.0.omod new file mode 100644 index 0000000..ecb8276 --- /dev/null +++ b/projects/emr-isanteplus/distribution/custom_modules/m2sys-biometrics-1.0.0.omod @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73210f3c22f05b8b0af2faee9afb3c29a6157d54f9d2c0d0b964bea6729ac3e3 +size 581138 diff --git a/packages/emr-isanteplus/config/custom_modules/xds-sender-2.5.0-SNAPSHOT.omod b/projects/emr-isanteplus/distribution/custom_modules/xds-sender-2.5.0-SNAPSHOT.omod similarity index 100% rename from packages/emr-isanteplus/config/custom_modules/xds-sender-2.5.0-SNAPSHOT.omod rename to projects/emr-isanteplus/distribution/custom_modules/xds-sender-2.5.0-SNAPSHOT.omod diff --git a/projects/emr-isanteplus/distribution/openmrs_modules/isanteplus-1.4.2.omod b/projects/emr-isanteplus/distribution/openmrs_modules/isanteplus-1.4.2.omod deleted file mode 100644 index a4d2a35..0000000 --- a/projects/emr-isanteplus/distribution/openmrs_modules/isanteplus-1.4.2.omod +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bab88b0c69a6bae60b922e33f74ad35ffdac5b30aea7bf4ce9359043804b9292 -size 2520007 diff --git a/projects/emr-isanteplus/distribution/openmrs_modules/isanteplus-1.4.6.omod b/projects/emr-isanteplus/distribution/openmrs_modules/isanteplus-1.4.6.omod new file mode 100644 index 0000000..94f796a --- /dev/null +++ b/projects/emr-isanteplus/distribution/openmrs_modules/isanteplus-1.4.6.omod @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e09c476d122caa505b9680a349add01679180246024e1282e9175699f8c7c6c2 +size 2568109 diff --git a/projects/emr-isanteplus/distribution/openmrs_modules/labintegration-2.3.7-SNAPSHOT.omod b/projects/emr-isanteplus/distribution/openmrs_modules/labintegration-2.3.7-SNAPSHOT.omod new file mode 100644 index 0000000..68061f1 --- /dev/null +++ b/projects/emr-isanteplus/distribution/openmrs_modules/labintegration-2.3.7-SNAPSHOT.omod @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be9a2c1c228832d2d4c5755a851710b6904fd579fff1f8035c6f4d35d5af20d0 +size 125910