Skip to content

Commit eade6e9

Browse files
jonhealy1jonhealy1
authored
Merge pull request #1 from Healy-Hyperspatial/sfes-mongo
Stac-fastapi-mongo
2 parents ad2dc7e + 95e3b84 commit eade6e9

Some content is hidden

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

54 files changed

+1279
-4655
lines changed

‎.github/workflows/cicd.yml

Lines changed: 107 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
name: stac-fastapi-elasticsearch
2-
on:
1+
name: stac-fastapi-mongo
32
push:
43
branches:
54
- main
@@ -8,123 +7,123 @@ on:
87
- main
98
- features/**
109

11-
jobs:
12-
test:
13-
runs-on: ubuntu-latest
14-
timeout-minutes: 10
10+
# jobs:
11+
# test:
12+
# runs-on: ubuntu-latest
13+
# timeout-minutes: 10
1514

16-
services:
15+
# services:
1716

18-
elasticsearch_8_svc:
19-
image: docker.elastic.co/elasticsearch/elasticsearch:8.11.0
20-
env:
21-
cluster.name: stac-cluster
22-
node.name: es01
23-
network.host: 0.0.0.0
24-
transport.host: 0.0.0.0
25-
discovery.type: single-node
26-
http.port: 9200
27-
xpack.license.self_generated.type: basic
28-
xpack.security.enabled: false
29-
xpack.security.transport.ssl.enabled: false
30-
ES_JAVA_OPTS: -Xms512m -Xmx1g
31-
ports:
32-
- 9200:9200
17+
# elasticsearch_8_svc:
18+
# image: docker.elastic.co/elasticsearch/elasticsearch:8.11.0
19+
# env:
20+
# cluster.name: stac-cluster
21+
# node.name: es01
22+
# network.host: 0.0.0.0
23+
# transport.host: 0.0.0.0
24+
# discovery.type: single-node
25+
# http.port: 9200
26+
# xpack.license.self_generated.type: basic
27+
# xpack.security.enabled: false
28+
# xpack.security.transport.ssl.enabled: false
29+
# ES_JAVA_OPTS: -Xms512m -Xmx1g
30+
# ports:
31+
# - 9200:9200
3332

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
33+
# elasticsearch_7_svc:
34+
# image: docker.elastic.co/elasticsearch/elasticsearch:7.17.1
35+
# env:
36+
# cluster.name: stac-cluster
37+
# node.name: es01
38+
# network.host: 0.0.0.0
39+
# transport.host: 0.0.0.0
40+
# discovery.type: single-node
41+
# http.port: 9400
42+
# xpack.license.self_generated.type: basic
43+
# xpack.security.enabled: false
44+
# xpack.security.transport.ssl.enabled: false
45+
# ES_JAVA_OPTS: -Xms512m -Xmx1g
46+
# ports:
47+
# - 9400:9400
4948

50-
opensearch_2_11:
51-
image: opensearchproject/opensearch:2.11.1
52-
env:
53-
cluster.name: stac-cluster
54-
node.name: os01
55-
network.host: 0.0.0.0
56-
transport.host: 0.0.0.0
57-
discovery.type: single-node
58-
http.port: 9202
59-
http.cors.enabled: true
60-
plugins.security.disabled: true
61-
plugins.security.ssl.http.enabled: true
62-
OPENSEARCH_JAVA_OPTS: -Xms512m -Xmx512m
63-
ports:
64-
- 9202:9202
65-
strategy:
66-
matrix:
67-
python-version: [ "3.8", "3.9", "3.10", "3.11"]
49+
# opensearch_2_11:
50+
# image: opensearchproject/opensearch:2.11.1
51+
# env:
52+
# cluster.name: stac-cluster
53+
# node.name: os01
54+
# network.host: 0.0.0.0
55+
# transport.host: 0.0.0.0
56+
# discovery.type: single-node
57+
# http.port: 9202
58+
# http.cors.enabled: true
59+
# plugins.security.disabled: true
60+
# plugins.security.ssl.http.enabled: true
61+
# OPENSEARCH_JAVA_OPTS: -Xms512m -Xmx512m
62+
# ports:
63+
# - 9202:9202
64+
# strategy:
65+
# matrix:
66+
# python-version: [ "3.8", "3.9", "3.10", "3.11"]
6867

69-
name: Python ${{ matrix.python-version }} testing
68+
# name: Python ${{ matrix.python-version }} testing
7069

71-
steps:
72-
- name: Check out repository code
73-
uses: actions/checkout@v4
70+
# steps:
71+
# - name: Check out repository code
72+
# uses: actions/checkout@v4
7473

75-
# Setup Python (faster than using Python container)
76-
- name: Setup Python
77-
uses: actions/setup-python@v5
78-
with:
79-
python-version: ${{ matrix.python-version }}
80-
- name: Lint code
81-
uses: pre-commit/[email protected]
74+
# # Setup Python (faster than using Python container)
75+
# - name: Setup Python
76+
# uses: actions/setup-python@v5
77+
# with:
78+
# python-version: ${{ matrix.python-version }}
79+
# - name: Lint code
80+
# uses: pre-commit/[email protected]
8281

83-
- name: Install pipenv
84-
run: |
85-
python -m pip install --upgrade pipenv wheel
82+
# - name: Install pipenv
83+
# run: |
84+
# python -m pip install --upgrade pipenv wheel
8685

87-
- name: Install elasticsearch stac-fastapi
88-
run: |
89-
pip install ./stac_fastapi/elasticsearch[dev,server]
86+
# - name: Install elasticsearch stac-fastapi
87+
# run: |
88+
# pip install ./stac_fastapi/elasticsearch[dev,server]
9089

91-
- name: Install opensearch stac-fastapi
92-
run: |
93-
pip install ./stac_fastapi/opensearch[dev,server]
90+
# - name: Install opensearch stac-fastapi
91+
# run: |
92+
# pip install ./stac_fastapi/opensearch[dev,server]
9493

95-
- name: Install core library stac-fastapi
96-
run: |
97-
pip install ./stac_fastapi/core
94+
# - name: Install core library stac-fastapi
95+
# run: |
96+
# pip install ./stac_fastapi/core
9897

99-
- name: Run test suite against Elasticsearch 7.x
100-
run: |
101-
pipenv run pytest -svvv
102-
env:
103-
ENVIRONMENT: testing
104-
ES_PORT: 9200
105-
ES_HOST: 172.17.0.1
106-
ES_USE_SSL: false
107-
ES_VERIFY_CERTS: false
108-
BACKEND: elasticsearch
98+
# - name: Run test suite against Elasticsearch 7.x
99+
# run: |
100+
# pipenv run pytest -svvv
101+
# env:
102+
# ENVIRONMENT: testing
103+
# ES_PORT: 9200
104+
# ES_HOST: 172.17.0.1
105+
# ES_USE_SSL: false
106+
# ES_VERIFY_CERTS: false
107+
# BACKEND: elasticsearch
109108

110-
- name: Run test suite against Elasticsearch 8.x
111-
run: |
112-
pipenv run pytest -svvv
113-
env:
114-
ENVIRONMENT: testing
115-
ES_PORT: 9400
116-
ES_HOST: 172.17.0.1
117-
ES_USE_SSL: false
118-
ES_VERIFY_CERTS: false
119-
BACKEND: elasticsearch
109+
# - name: Run test suite against Elasticsearch 8.x
110+
# run: |
111+
# pipenv run pytest -svvv
112+
# env:
113+
# ENVIRONMENT: testing
114+
# ES_PORT: 9400
115+
# ES_HOST: 172.17.0.1
116+
# ES_USE_SSL: false
117+
# ES_VERIFY_CERTS: false
118+
# BACKEND: elasticsearch
120119

121-
- name: Run test suite against OpenSearch 2.11.1
122-
run: |
123-
pipenv run pytest -svvv
124-
env:
125-
ENVIRONMENT: testing
126-
ES_PORT: 9202
127-
ES_HOST: 172.17.0.1
128-
ES_USE_SSL: false
129-
ES_VERIFY_CERTS: false
130-
BACKEND: opensearch
120+
# - name: Run test suite against OpenSearch 2.11.1
121+
# run: |
122+
# pipenv run pytest -svvv
123+
# env:
124+
# ENVIRONMENT: testing
125+
# ES_PORT: 9202
126+
# ES_HOST: 172.17.0.1
127+
# ES_USE_SSL: false
128+
# ES_VERIFY_CERTS: false
129+
# BACKEND: opensearch

‎Dockerfile.deploy.es

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

‎Dockerfile.dev.es

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

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ run_os = docker-compose \
2828

2929
.PHONY: image-deploy-es
3030
image-deploy-es:
31-
docker build -f Dockerfile.dev.es -t stac-fastapi-elasticsearch:latest .
31+
docker build -f dockerfiles/Dockerfile.dev.es -t stac-fastapi-elasticsearch:latest .
3232

3333
.PHONY: image-deploy-os
3434
image-deploy-os:
35-
docker build -f Dockerfile.dev.os -t stac-fastapi-opensearch:latest .
35+
docker build -f dockerfiles/Dockerfile.dev.os -t stac-fastapi-opensearch:latest .
3636

3737
.PHONY: run-deploy-locally
3838
run-deploy-locally:

0 commit comments

Comments
 (0)