From 6f351b5556491b677439c0b4198a827e241f796b Mon Sep 17 00:00:00 2001 From: kdaud Date: Fri, 24 May 2024 08:56:06 +0300 Subject: [PATCH] Next development: 1.0.0-SNAPSHOT --- .gitpod.yml | 2 +- demo/pom.xml | 2 +- docker-compose-common.yml | 2 +- docker-compose-erpnext.yml | 2 +- docker-compose-odoo.yml | 4 ++-- docker-compose-openmrs.yml | 4 ++-- docker-compose-senaite.yml | 4 ++-- pom.xml | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index a38c859..d2541f0 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,7 +1,7 @@ tasks: - name: Run Ozone FOSS init: scripts/mvnw clean package - - command: source target/go-to-scripts-dir.sh && ./start-demo.sh 1.0.0-alpha.10 # Replace by the version of your choice + - command: source target/go-to-scripts-dir.sh && ./start-demo.sh 1.0.0-SNAPSHOT # Replace by the version of your choice ports: - name: OpenMRS description: OpenMRS 3 diff --git a/demo/pom.xml b/demo/pom.xml index 6eb8ef5..89becdf 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -4,7 +4,7 @@ com.ozonehis ozone-demo-data Resources to create demo data for Ozone - 1.0.0-alpha.10 + 1.0.0-SNAPSHOT pom diff --git a/docker-compose-common.yml b/docker-compose-common.yml index c98eac7..5981742 100644 --- a/docker-compose-common.yml +++ b/docker-compose-common.yml @@ -6,7 +6,7 @@ networks: services: env-substitution: - image: mekomsolutions/env-substitution:1e6fa02 + image: mekomsolutions/env-substitution networks: - ozone restart: on-failure diff --git a/docker-compose-erpnext.yml b/docker-compose-erpnext.yml index ab24594..d3159a5 100644 --- a/docker-compose-erpnext.yml +++ b/docker-compose-erpnext.yml @@ -207,7 +207,7 @@ services: - EIP_FHIR_SERVER_URL=http://openmrs:8080/openmrs/ws/fhir2/R4 - EIP_FHIR_USERNAME=${OPENMRS_USER} - EIP_FHIR_PASSWORD=${OPENMRS_PASSWORD} - image: mekomsolutions/eip-client:2.0.0 + image: mekomsolutions/eip-client networks: ozone: aliases: diff --git a/docker-compose-odoo.yml b/docker-compose-odoo.yml index 165a6ad..3efa8f0 100644 --- a/docker-compose-odoo.yml +++ b/docker-compose-odoo.yml @@ -12,7 +12,7 @@ services: - ADDONS=sale_management,stock,account_account,purchase,mrp,odoo_initializer,ozone_settings,mrp_product_expiry,product_expiry,l10n_generic_coa - INITIALIZER_DATA_FILES_PATH=/mnt/odoo_config - INITIALIZER_CONFIG_FILE_PATH=/mnt/odoo_config/initializer_config.json - image: mekomsolutions/odoo:2c1706f + image: mekomsolutions/odoo labels: traefik.enable: true # https @@ -94,7 +94,7 @@ services: - OPENMRS_DB_PASSWORD=${OPENMRS_DB_PASSWORD} - OPENMRS_USER=${OPENMRS_USER} - OPENMRS_PASSWORD=${OPENMRS_PASSWORD} - image: mekomsolutions/eip-client:2.0.0 + image: mekomsolutions/eip-client networks: ozone: aliases: diff --git a/docker-compose-openmrs.yml b/docker-compose-openmrs.yml index be02ec2..c84ac09 100644 --- a/docker-compose-openmrs.yml +++ b/docker-compose-openmrs.yml @@ -22,7 +22,7 @@ services: timeout: 5s retries: 48 start_period: 120s - image: openmrs/openmrs-reference-application-3-backend:3.0.0-beta.18 + image: openmrs/openmrs-reference-application-3-backend:${O3_DOCKER_IMAGE_TAG:-nightly} labels: traefik.enable: "true" traefik.http.routers.openmrs.rule: "Host(`${O3_HOSTNAME}`) && PathPrefix(`/openmrs`)" @@ -54,7 +54,7 @@ services: healthcheck: test: ["CMD", "curl", "-f", "http://localhost/"] timeout: 5s - image: openmrs/openmrs-reference-application-3-frontend:3.0.0-beta.18 + image: openmrs/openmrs-reference-application-3-frontend:${O3_DOCKER_IMAGE_TAG:-nightly} labels: traefik.enable: "true" traefik.http.routers.frontend.rule: "Host(`${O3_HOSTNAME}`) && PathPrefix(`/openmrs/spa/`)" diff --git a/docker-compose-senaite.yml b/docker-compose-senaite.yml index a7cca5a..fd780be 100644 --- a/docker-compose-senaite.yml +++ b/docker-compose-senaite.yml @@ -9,7 +9,7 @@ services: - SITE=${SITE} - ADMIN_USER=${SENAITE_ADMIN_USER} - ADMIN_PASSWORD=${SENAITE_ADMIN_PASSWORD} - image: mekomsolutions/senaite:2.3.0-1.0.0 + image: mekomsolutions/senaite:latest labels: - "traefik.enable=true" - "traefik.http.services.senaite.loadbalancer.server.port=8080" @@ -62,7 +62,7 @@ services: - OPENMRS_DB_PASSWORD=${OPENMRS_DB_PASSWORD} - OPENMRS_USER=${OPENMRS_USER} - OPENMRS_PASSWORD=${OPENMRS_PASSWORD} - image: mekomsolutions/eip-client:2.0.0 + image: mekomsolutions/eip-client networks: ozone: aliases: diff --git a/pom.xml b/pom.xml index 1ae2b45..7f091e1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.ozonehis ozone-docker-compose Ozone Docker Compose - 1.0.0-alpha.10 + 1.0.0-SNAPSHOT pom @@ -20,7 +20,7 @@ UTF-8 - 1.0.0-alpha.10 + 1.0.0-SNAPSHOT true