Skip to content

Commit 34f36a1

Browse files
committed
resolve the req change
1 parent 3e67674 commit 34f36a1

File tree

4 files changed

+14
-17
lines changed

4 files changed

+14
-17
lines changed

dockerfiles/Dockerfile.ci.es

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
FROM debian:bookworm-slim AS base
22

3-
ENV ENVIRONMENT="local"
4-
ENV APP_HOST="0.0.0.0"
5-
ENV APP_PORT="8080"
6-
ENV WEB_CONCURRENCY=10
7-
ENV ES_USE_SSL=false
8-
ENV ES_VERIFY_CERTS=false
9-
ENV STAC_FASTAPI_RATE_LIMIT="200/minute"
103
ENV RUN_LOCAL_ES=0
114

125
RUN apt-get update && \
@@ -49,7 +42,6 @@ ENV ES_JAVA_OPTS="-Xms512m -Xmx1g" \
4942
HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 CMD \
5043
curl --silent --fail http://${APP_HOST}:${APP_PORT}/api.html || exit 1
5144

52-
EXPOSE $APP_PORT
5345

5446
USER elasticsearch
5547
ENTRYPOINT ["/entrypoint.sh"]

dockerfiles/Dockerfile.ci.os

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
FROM debian:bookworm-slim AS base
22

3-
ENV ENVIRONMENT="local"
4-
ENV APP_HOST="0.0.0.0"
5-
ENV APP_PORT="8080"
6-
ENV WEB_CONCURRENCY=10
7-
ENV ES_USE_SSL=false
8-
ENV ES_VERIFY_CERTS=false
9-
ENV STAC_FASTAPI_RATE_LIMIT="200/minute"
103
ENV RUN_LOCAL_OS=0
114

125
RUN apt-get update && \
@@ -47,7 +40,5 @@ ENV OPENSEARCH_JAVA_OPTS="-Xms512m -Xmx1g" \
4740
HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 CMD \
4841
curl --silent --fail http://${APP_HOST}:${APP_PORT}/api.html || exit 1
4942

50-
EXPOSE $APP_PORT
51-
5243
USER opensearch
5344
ENTRYPOINT ["/entrypoint.sh"]

dockerfiles/entrypoint-es.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ YELLOW='\033[1;33m'
77
BLUE='\033[0;34m'
88
NC='\033[0m'
99

10+
APP_HOST="${APP_HOST:-0.0.0.0}"
11+
APP_PORT="${APP_PORT:-8080}"
12+
WEB_CONCURRENCY="${WEB_CONCURRENCY:-10}"
13+
ES_USE_SSL="${ES_USE_SSL:-false}"
14+
ES_VERIFY_CERTS="${ES_VERIFY_CERTS:-false}"
15+
STAC_FASTAPI_RATE_LIMIT="${STAC_FASTAPI_RATE_LIMIT:-'200/minute'}"
16+
1017
function print_error() {
1118
echo -e "${RED}ERROR: $1${NC}" >&2
1219
}

dockerfiles/entrypoint-os.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ YELLOW='\033[1;33m'
77
BLUE='\033[0;34m'
88
NC='\033[0m'
99

10+
APP_HOST="${APP_HOST:-0.0.0.0}"
11+
APP_PORT="${APP_PORT:-8080}"
12+
WEB_CONCURRENCY="${WEB_CONCURRENCY:-10}"
13+
ES_USE_SSL="${ES_USE_SSL:-false}"
14+
ES_VERIFY_CERTS="${ES_VERIFY_CERTS:-false}"
15+
STAC_FASTAPI_RATE_LIMIT="${STAC_FASTAPI_RATE_LIMIT:-'200/minute'}"
16+
1017
function print_error() {
1118
echo -e "${RED}ERROR: $1${NC}" >&2
1219
}

0 commit comments

Comments
 (0)