Update addons

openmrs · Mar 30, 2021 · 92b2f36 · 92b2f36
1 parent fe74ff8
commit 92b2f36
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/files/addons/.env b/files/addons/.env
@@ -1,10 +1,10 @@
 $ANSIBLE_VAULT;1.1;AES256
-36366432393162633465353034373435316331626538363435636430666438386430353335613238
-3239303332623939613563393565313065373734356364300a316331613138626663326138613732
-65613564616338386563613161343538333064326435626335336261303033633533373165373332
-3233613139326364300a656137633930613262373632373935353938616130656630336165396161
-33346434613334313363393039663439636465663439373933353835326239396633613531343539
-30613539376366336134356562646366343462396138376633373134316231336464393134653032
-33393664303339333862336231613535663963646663326639326161373435656433396563363233
-34366139386330383363346539313066663161383538383865616434333632396430653534656138
-3066
+61306137633831306537343865353435663931636565393538613761636661656533383438616437
+3735636565313230653634346137376132626433633365660a386239396561363334373464303037
+33653261306234326466326363393234653163396462343062623534383039333833333530633962
+3932336262656563620a663565303966653965336639343537376234313665323464636434313838
+66326233346239653336663036343339366638343966613765323330633865666133343061353330
+62373030323032303634323266306232383461356235316537393065396566613562323762363466
+30383637653864333333386331396135643739383137313734623766373361343030653132373065
+30666235313962616330326362636238626334623930643338666263393464323336633330656633
+6330
diff --git a/files/addons/docker-compose.yml b/files/addons/docker-compose.yml
@@ -4,33 +4,33 @@ services:
 
   addonindex:
     restart: "always"
-    image: openmrs/addonindex:production
+    image: docker.io/openmrs/addonindex:production
     ports:
       - "8081:8080"
     environment:
-      - spring.elasticsearch.jest.uris=http://elasticsearch:9200
-      - bintray.username
-      - bintray.api_key
+      - ELASTICSEARCH_URL=http://elasticsearch:9200
+      - BINTRAY_USERNAME
+      - BINTRAY_API_KEY
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8080/"]
-      timeout: 5s
+      test: ["CMD", "curl", "-sSL", "http://localhost:8080/"]
+      timeout: 15s
+    links:
+      - elasticsearch
     depends_on:
       elasticsearch:
         condition: service_healthy
 
   elasticsearch:
     restart: "always"
-    image: elasticsearch:5.1
-    expose:
-      - "9200"
-      - "9300"
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.11.1
     environment:
-      - ES_JAVA_OPTS=-Xms1g -Xmx1g
+      - "ES_JAVA_OPTS=-Xms1g -Xmx1g"
+      - "discovery.type=single-node"
     volumes:
       - esdata:/usr/share/elasticsearch/data
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:9200/"]
-      timeout: 15s
+      test: ["CMD", "curl", "-sSL", "http://localhost:9200/_cluster/health"]
+      timeout: 30s
 
 volumes:
   esdata: