From 1fbbeb6879f35eee4e93fe47c051ab59098d747d Mon Sep 17 00:00:00 2001 From: Emmanuel Nyachoke Date: Fri, 8 Dec 2023 12:41:50 +0300 Subject: [PATCH 1/2] Release 1.0.0-alpha.8 --- docker-compose-demo.yml | 2 +- docker-compose-odoo.yml | 2 +- docker-compose-senaite.yml | 2 +- docker-compose.yml | 12 ++++++------ pom.xml | 2 +- readme/manual-setup.md | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docker-compose-demo.yml b/docker-compose-demo.yml index 1f7e219..497e424 100644 --- a/docker-compose-demo.yml +++ b/docker-compose-demo.yml @@ -1,7 +1,7 @@ services: eip-client-demo: - image: mekomsolutions/eip-client + image: mekomsolutions/eip-client:sha-553ea01 restart: "no" env_file: .common_eip_env environment: diff --git a/docker-compose-odoo.yml b/docker-compose-odoo.yml index d8dafd3..3c2eacb 100644 --- a/docker-compose-odoo.yml +++ b/docker-compose-odoo.yml @@ -9,7 +9,7 @@ services: # Odoo integration service eip-client-odoo: - image: mekomsolutions/eip-client + image: mekomsolutions/eip-client:sha-553ea01 restart: unless-stopped env_file: .common_eip_env environment: diff --git a/docker-compose-senaite.yml b/docker-compose-senaite.yml index 17e3e3f..3f131a6 100644 --- a/docker-compose-senaite.yml +++ b/docker-compose-senaite.yml @@ -9,7 +9,7 @@ services: # SENAITE integration service eip-client-senaite: - image: mekomsolutions/eip-client + image: mekomsolutions/eip-client:sha-553ea01 restart: unless-stopped env_file: .common_eip_env environment: diff --git a/docker-compose.yml b/docker-compose.yml index ef56789..20d638a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ services: # Bahmni Appointments appointments: - image: mekomsolutions/appointments + image: mekomsolutions/appointments:4a3d534 restart: unless-stopped healthcheck: test: @@ -18,7 +18,7 @@ services: # mekomsolutions/env-substitution env-substitution: - image: mekomsolutions/env-substitution + image: mekomsolutions/env-substitution:1e6fa02 restart: on-failure environment: - ODOO_PUBLIC_URL=https://${ODOO_HOSTNAME} @@ -34,7 +34,7 @@ services: # OpenMRS 3 Backend openmrs: - image: openmrs/openmrs-reference-application-3-backend:${O3_BACKEND_TAG:-nightly} + image: openmrs/openmrs-reference-application-3-backend:3.0.0-beta.16 restart: unless-stopped depends_on: mysql: @@ -145,7 +145,7 @@ services: depends_on: postgresql: condition: service_healthy - image: mekomsolutions/odoo + image: mekomsolutions/odoo:2c1706f restart: unless-stopped environment: - HOST=${POSTGRES_DB_HOST} @@ -199,7 +199,7 @@ services: # OpenMRS 3 Frontend frontend: - image: openmrs/openmrs-reference-application-3-frontend:${O3_FRONTEND_TAG:-nightly} + image: openmrs/openmrs-reference-application-3-frontend:3.0.0-beta.16 restart: unless-stopped environment: SPA_PATH: /openmrs/spa @@ -335,7 +335,7 @@ services: - SITE=${SITE} - ADMIN_USER=${SENAITE_ADMIN_USER} - ADMIN_PASSWORD=${SENAITE_ADMIN_PASSWORD} - image: mekomsolutions/senaite:latest + image: mekomsolutions/senaite:sha-272c0f5 restart: unless-stopped volumes: - ${SENAITE_CONFIG_PATH}/data:/data/importdata/senaite diff --git a/pom.xml b/pom.xml index f78f265..c33b05b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.ozonehis ozone-docker-compose Ozone Docker Compose - 1.0.0-SNAPSHOT + 1.0.0-alpha.8 pom diff --git a/readme/manual-setup.md b/readme/manual-setup.md index b3340a1..836b357 100644 --- a/readme/manual-setup.md +++ b/readme/manual-setup.md @@ -61,7 +61,7 @@ If you have already set up Ozone before you may need to clean up your local envi ### Step 5. Download and extract the distribution ```bash -export VERSION=1.0.0-alpha.7&& \ +export VERSION=1.0.0-alpha.8&& \ ./mvnw org.apache.maven.plugins:maven-dependency-plugin:3.2.0:get -DremoteRepositories=https://nexus.mekomsolutions.net/repository/maven-public -Dartifact=com.ozonehis:ozone-distro:$VERSION:zip -Dtransitive=false --legacy-local-repository && \ ./mvnw org.apache.maven.plugins:maven-dependency-plugin:3.2.0:unpack -Dproject.basedir=$OZONE_DIR -Dartifact=com.ozonehis:ozone-distro:$VERSION:zip -DoutputDirectory=$OZONE_DIR/ozone-distro-$VERSION ``` @@ -88,8 +88,8 @@ export ODOO_EXTRA_ADDONS=$DISTRO_PATH/odoo_config/addons; \ export ODOO_CONFIG_PATH=$DISTRO_PATH/odoo_config/odoo_csv; \ export ODOO_INITIALIZER_CONFIG_FILE_PATH=$DISTRO_PATH/odoo_config/config/initializer_config.json; \ export ODOO_CONFIG_FILE_PATH=$DISTRO_PATH/odoo_config/config/odoo.conf; \ -export O3_FRONTEND_TAG=3.0.0-beta.13; \ -export O3_BACKEND_TAG=3.0.0-beta.13; +export O3_FRONTEND_TAG=3.0.0-beta.16; \ +export O3_BACKEND_TAG=3.0.0-beta.16; ``` #### How to activate Ozone demo data generation From a022be3eaaff0bb5cdc364fb0b4c52db2e9b85ce Mon Sep 17 00:00:00 2001 From: Emmanuel Nyachoke Date: Fri, 8 Dec 2023 13:51:26 +0300 Subject: [PATCH 2/2] Next development 1.0.0-SNAPSHOT --- docker-compose-demo.yml | 2 +- docker-compose-odoo.yml | 2 +- docker-compose-senaite.yml | 2 +- docker-compose.yml | 12 ++++++------ pom.xml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docker-compose-demo.yml b/docker-compose-demo.yml index 497e424..1f7e219 100644 --- a/docker-compose-demo.yml +++ b/docker-compose-demo.yml @@ -1,7 +1,7 @@ services: eip-client-demo: - image: mekomsolutions/eip-client:sha-553ea01 + image: mekomsolutions/eip-client restart: "no" env_file: .common_eip_env environment: diff --git a/docker-compose-odoo.yml b/docker-compose-odoo.yml index 3c2eacb..d8dafd3 100644 --- a/docker-compose-odoo.yml +++ b/docker-compose-odoo.yml @@ -9,7 +9,7 @@ services: # Odoo integration service eip-client-odoo: - image: mekomsolutions/eip-client:sha-553ea01 + image: mekomsolutions/eip-client restart: unless-stopped env_file: .common_eip_env environment: diff --git a/docker-compose-senaite.yml b/docker-compose-senaite.yml index 3f131a6..17e3e3f 100644 --- a/docker-compose-senaite.yml +++ b/docker-compose-senaite.yml @@ -9,7 +9,7 @@ services: # SENAITE integration service eip-client-senaite: - image: mekomsolutions/eip-client:sha-553ea01 + image: mekomsolutions/eip-client restart: unless-stopped env_file: .common_eip_env environment: diff --git a/docker-compose.yml b/docker-compose.yml index 20d638a..ef56789 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ services: # Bahmni Appointments appointments: - image: mekomsolutions/appointments:4a3d534 + image: mekomsolutions/appointments restart: unless-stopped healthcheck: test: @@ -18,7 +18,7 @@ services: # mekomsolutions/env-substitution env-substitution: - image: mekomsolutions/env-substitution:1e6fa02 + image: mekomsolutions/env-substitution restart: on-failure environment: - ODOO_PUBLIC_URL=https://${ODOO_HOSTNAME} @@ -34,7 +34,7 @@ services: # OpenMRS 3 Backend openmrs: - image: openmrs/openmrs-reference-application-3-backend:3.0.0-beta.16 + image: openmrs/openmrs-reference-application-3-backend:${O3_BACKEND_TAG:-nightly} restart: unless-stopped depends_on: mysql: @@ -145,7 +145,7 @@ services: depends_on: postgresql: condition: service_healthy - image: mekomsolutions/odoo:2c1706f + image: mekomsolutions/odoo restart: unless-stopped environment: - HOST=${POSTGRES_DB_HOST} @@ -199,7 +199,7 @@ services: # OpenMRS 3 Frontend frontend: - image: openmrs/openmrs-reference-application-3-frontend:3.0.0-beta.16 + image: openmrs/openmrs-reference-application-3-frontend:${O3_FRONTEND_TAG:-nightly} restart: unless-stopped environment: SPA_PATH: /openmrs/spa @@ -335,7 +335,7 @@ services: - SITE=${SITE} - ADMIN_USER=${SENAITE_ADMIN_USER} - ADMIN_PASSWORD=${SENAITE_ADMIN_PASSWORD} - image: mekomsolutions/senaite:sha-272c0f5 + image: mekomsolutions/senaite:latest restart: unless-stopped volumes: - ${SENAITE_CONFIG_PATH}/data:/data/importdata/senaite diff --git a/pom.xml b/pom.xml index c33b05b..f78f265 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.ozonehis ozone-docker-compose Ozone Docker Compose - 1.0.0-alpha.8 + 1.0.0-SNAPSHOT pom