Merge pull request #743 from TerriaJS/fix-elasticsearch

Made snapshots directory work in ES again.

deploy/helm/search-data-gov-au.yml

@@ -54,11 +54,6 @@ gateway:
         requests:
             cpu: 200m
             memory: 200Mi
-indexer:
-    resources:
-        requests:
-            cpu: 200m
-            memory: 200Mi
 preview-map:
     replicas: 2
     resources:
@@ -158,6 +153,10 @@ indexer:
 #    useGcsSnapshots: true
 #    gcsSnapshotBucket: "magda-es-snapshots"
 #    gcsSnapshotServiceAccount: "_default"
+  resources:
+    requests:
+      cpu: 200m
+      memory: 200Mi
 feedback-api:
     gitHubIssuesUrl: "https://api.github.com/repos/TerriaJS/Magda-Feedback/issues"
     replicas: 2

magda-elastic-search/Dockerfile

@@ -1,7 +1,7 @@
 FROM quay.io/pires/docker-elasticsearch-kubernetes:5.6.3
 
-VOLUME /snapshots
+ADD component/elasticsearch.yml /elasticsearch/config/elasticsearch.yml
+ADD component/setup.sh /setup.sh
+RUN apk add --no-cache --update curl procps
 
-ENV REPO /snapshots
-
-ADD component/elasticsearch.yml /elasticsearch/config/elasticsearch.yml
+CMD ["/setup.sh"]

magda-elastic-search/package.json

@@ -15,7 +15,7 @@
     "config": {
         "docker": {
             "name": "data61/magda-elasticsearch",
-            "include": "Dockerfile elasticsearch.yml"
+            "include": "Dockerfile elasticsearch.yml setup.sh"
         }
     },
     "devDependencies": {