re-add es7 config

stac-utils · Apr 25, 2022 · 84adcfd · 84adcfd
1 parent 7c11ff2
commit 84adcfd
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 12 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -31,6 +31,22 @@ jobs:
         ports:
           - 9200:9200
 
+      elasticsearch_7_svc:
+        image: docker.elastic.co/elasticsearch/elasticsearch:7.17.1
+        env:
+          cluster.name: stac-cluster
+          node.name: es01
+          network.host: 0.0.0.0
+          transport.host: 0.0.0.0
+          discovery.type: single-node
+          http.port: 9400
+          xpack.license.self_generated.type: basic
+          xpack.security.enabled: false
+          xpack.security.transport.ssl.enabled: false
+          ES_JAVA_OPTS: -Xms512m -Xmx1g
+        ports:
+          - 9400:9400
+
     steps:
       - name: Check out repository code
         uses: actions/checkout@v3
@@ -52,12 +68,22 @@ jobs:
         run: |
           pip install ./stac_fastapi/elasticsearch[dev,server]
 
-      - name: Run test suite against Elasticsearch 8.x
+      - name: Run test suite against Elasticsearch 7.x
         run: |
           cd stac_fastapi/elasticsearch && pipenv run pytest -svvv
         env:
           ENVIRONMENT: testing
           ES_PORT: 9200
           ES_HOST: 172.17.0.1
           ES_USE_SSL: false
+          ES_VERIFY_CERTS: false
+
+      - name: Run test suite against Elasticsearch 8.x
+        run: |
+          cd stac_fastapi/elasticsearch && pipenv run pytest -svvv
+        env:
+          ENVIRONMENT: testing
+          ES_PORT: 9400
+          ES_HOST: 172.17.0.1
+          ES_USE_SSL: false
           ES_VERIFY_CERTS: false
diff --git a/README.md b/README.md
@@ -37,22 +37,14 @@ docker-compose build
 docker-compose up
 ```
 
-By default, docker-compose uses Elasticsearch 7.x. If you wish to use a different version, put the following in a 
+By default, docker-compose uses Elasticsearch 8.x. However, most recent 7.x versions should also work. 
+If you wish to use a different version, put the following in a 
 file named `.env` in the same directory you run docker-compose from:
 
 ```shell
-ELASTICSEARCH_VERSION=7.12.0
+ELASTICSEARCH_VERSION=7.17.1
 ```
 
-### Generate a keystore and cert
-
-```shell
-docker-compose -f docker-compose.setup.yml run --rm keystore
-docker-compose -f docker-compose.setup.yml run --rm certs
-```
-
-
-
 To create a new Collection:
 
 ```shell