Skip to content

Commit 84adcfd

Browse files
author
Phil Varner
committed
re-add es7 config
1 parent 7c11ff2 commit 84adcfd

File tree

2 files changed

+30
-12
lines changed

2 files changed

+30
-12
lines changed

.github/workflows/cicd.yml

+27-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,22 @@ jobs:
3131
ports:
3232
- 9200:9200
3333

34+
elasticsearch_7_svc:
35+
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.1
36+
env:
37+
cluster.name: stac-cluster
38+
node.name: es01
39+
network.host: 0.0.0.0
40+
transport.host: 0.0.0.0
41+
discovery.type: single-node
42+
http.port: 9400
43+
xpack.license.self_generated.type: basic
44+
xpack.security.enabled: false
45+
xpack.security.transport.ssl.enabled: false
46+
ES_JAVA_OPTS: -Xms512m -Xmx1g
47+
ports:
48+
- 9400:9400
49+
3450
steps:
3551
- name: Check out repository code
3652
uses: actions/checkout@v3
@@ -52,12 +68,22 @@ jobs:
5268
run: |
5369
pip install ./stac_fastapi/elasticsearch[dev,server]
5470
55-
- name: Run test suite against Elasticsearch 8.x
71+
- name: Run test suite against Elasticsearch 7.x
5672
run: |
5773
cd stac_fastapi/elasticsearch && pipenv run pytest -svvv
5874
env:
5975
ENVIRONMENT: testing
6076
ES_PORT: 9200
6177
ES_HOST: 172.17.0.1
6278
ES_USE_SSL: false
79+
ES_VERIFY_CERTS: false
80+
81+
- name: Run test suite against Elasticsearch 8.x
82+
run: |
83+
cd stac_fastapi/elasticsearch && pipenv run pytest -svvv
84+
env:
85+
ENVIRONMENT: testing
86+
ES_PORT: 9400
87+
ES_HOST: 172.17.0.1
88+
ES_USE_SSL: false
6389
ES_VERIFY_CERTS: false

README.md

+3-11
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,14 @@ docker-compose build
3737
docker-compose up
3838
```
3939

40-
By default, docker-compose uses Elasticsearch 7.x. If you wish to use a different version, put the following in a
40+
By default, docker-compose uses Elasticsearch 8.x. However, most recent 7.x versions should also work.
41+
If you wish to use a different version, put the following in a
4142
file named `.env` in the same directory you run docker-compose from:
4243

4344
```shell
44-
ELASTICSEARCH_VERSION=7.12.0
45+
ELASTICSEARCH_VERSION=7.17.1
4546
```
4647

47-
### Generate a keystore and cert
48-
49-
```shell
50-
docker-compose -f docker-compose.setup.yml run --rm keystore
51-
docker-compose -f docker-compose.setup.yml run --rm certs
52-
```
53-
54-
55-
5648
To create a new Collection:
5749

5850
```shell

0 commit comments

Comments
 (0)