Skip to content

Commit 322ff19

Browse files
committed
update workflow, dockerfiles
1 parent d00ec14 commit 322ff19

File tree

4 files changed

+26
-3
lines changed

4 files changed

+26
-3
lines changed

.github/workflows/cicd.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ jobs:
9292
run: |
9393
pip install ./stac_fastapi/elasticsearch[dev,server]
9494
95+
- name: Install opensearch stac-fastapi
96+
run: |
97+
pip install ./stac_fastapi/opensearch[dev,server]
98+
9599
- name: Run test suite against Elasticsearch 7.x
96100
run: |
97101
cd stac_fastapi/elasticsearch && pipenv run pytest -svvv
@@ -114,7 +118,7 @@ jobs:
114118

115119
- name: Run test suite against OpenSearch 2.11.1
116120
run: |
117-
cd stac_fastapi/elasticsearch && pipenv run pytest -svvv
121+
cd stac_fastapi/opensearch && pipenv run pytest -svvv
118122
env:
119123
ENVIRONMENT: testing
120124
ES_PORT: 9202
File renamed without changes.

Dockerfile.dev.os

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
FROM python:3.10-slim
2+
3+
4+
# update apt pkgs, and install build-essential for ciso8601
5+
RUN apt-get update && \
6+
apt-get -y upgrade && \
7+
apt-get install -y build-essential && \
8+
apt-get clean && \
9+
rm -rf /var/lib/apt/lists/*
10+
11+
# update certs used by Requests
12+
ENV CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
13+
14+
WORKDIR /app
15+
16+
COPY . /app
17+
18+
RUN pip install --no-cache-dir -e ./stac_fastapi/core
19+
RUN pip install --no-cache-dir -e ./stac_fastapi/elasticsearch[dev,server]

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
restart: always
88
build:
99
context: .
10-
dockerfile: Dockerfile.dev
10+
dockerfile: Dockerfile.dev.es
1111
environment:
1212
- APP_HOST=0.0.0.0
1313
- APP_PORT=8080
@@ -36,7 +36,7 @@ services:
3636
restart: always
3737
build:
3838
context: .
39-
dockerfile: Dockerfile.dev
39+
dockerfile: Dockerfile.dev.os
4040
environment:
4141
- APP_HOST=0.0.0.0
4242
- APP_PORT=8082

0 commit comments

Comments
 (0)