Skip to content

Commit 8334a6e

Browse files
authored
Merge pull request #62 from Salcedo-HDF/2test
Test into Stage 2025-02-11a
2 parents e6a88ea + 5c1c51a commit 8334a6e

File tree

97 files changed

+888
-1397
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+888
-1397
lines changed

.github/pull_request_template.md

Lines changed: 13 additions & 0 deletions

Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# syntax=docker/dockerfile:1
22

33
### Dev Stage
4-
FROM openmrs/openmrs-core:dev-amazoncorretto-11 AS dev
4+
# FROM openmrs/openmrs-core:dev-amazoncorretto-11 AS dev
5+
FROM openmrs/openmrs-core:2.6.15-dev AS dev
56
WORKDIR /openmrs_distro
67

78
ARG MVN_ARGS_SETTINGS="-s /usr/share/maven/ref/settings-docker.xml -U -P distro"
@@ -26,7 +27,8 @@ RUN mvn $MVN_ARGS_SETTINGS clean
2627

2728
### Run Stage
2829
# Replace 'nightly' with the exact version of openmrs-core built for production (if available)
29-
FROM openmrs/openmrs-core:nightly-amazoncorretto-11
30+
# FROM openmrs/openmrs-core:nightly-amazoncorretto-11
31+
FROM openmrs/openmrs-core:2.6.15
3032

3133
# Do not copy the war if using the correct openmrs-core image version
3234
COPY --from=dev /openmrs/distribution/openmrs_core/openmrs.war /openmrs/distribution/openmrs_core/
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Cambodia%00,Banteay_DEMO Meanchey%01,Mongkol Borei%0101,Banteay Neang%010101,Ou Thum%01010101
2+
Cambodia%00,Banteay_DEMO Meanchey%01,Mongkol Borei%0101,Banteay Neang%010101,Phnum%01010102

distro/configuration/addresshierarchy/addresshierarchy-core_demo.csv

Lines changed: 0 additions & 345 deletions
This file was deleted.

0 commit comments

Comments
 (0)