Skip to content

Commit 8decdc1

Browse files
euiyounghwangeuiyounghwang
committed
Update
1 parent e6bb619 commit 8decdc1

14 files changed

+270
-162
lines changed

‎.coverage‎

52 KB
Binary file not shown.

‎Dockerfile‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ WORKDIR /app
3838
COPY --from=environment /app .
3939
COPY . FN-Basic-Services
4040

41-
# RUN chmod +x /app/FN-Basic-Services/*.sh
41+
# The reason might be that you saved the file on Windows, with CR LF as the line ending (\r\n).
42+
# https://stackoverflow.com/questions/14219092/bash-script-bin-bashm-bad-interpreter-no-such-file-or-directory
43+
RUN sed -i -e 's/\r$//' /app/FN-Basic-Services/*.sh
44+
4245

4346
ENTRYPOINT ["/app/FN-Basic-Services/docker-run-tests.sh"]
4447

@@ -56,14 +59,19 @@ ENV PYTHONDONTWRITEBYTECODE=1
5659
ENV PYTHONUNBUFFERED=1
5760

5861
# Configure Poetry
59-
ENV POETRY_VENV=/app/poetry-venv
60-
ENV PATH="$POETRY_VENV/bin:$PATH"
62+
# ENV POETRY_VENV=/app/poetry-venv
63+
# ENV PATH="$POETRY_VENV/bin:$PATH"
6164

6265
# Enable venv
63-
ENV PATH="$POETRY_VENV/bin:$PATH"
66+
# ENV PATH="$POETRY_VENV/bin:$PATH"
67+
68+
# The reason might be that you saved the file on Windows, with CR LF as the line ending (\r\n).
69+
# https://stackoverflow.com/questions/14219092/bash-script-bin-bashm-bad-interpreter-no-such-file-or-directory
70+
RUN sed -i -e 's/\r$//' /app/FN-Basic-Services/*.sh
6471

65-
# ENTRYPOINT ["/app/FN-Basic-Services/docker-run-entrypoints.sh"]
66-
# CMD ["gunicorn", "--bind", "0.0.0.0:8888", "main:app"]
72+
ENTRYPOINT ["/app/FN-Basic-Services/docker-run-entrypoints.sh"]
6773

6874
# Command to run Gunicorn with Uvicorn workers
69-
CMD ["gunicorn", "-w", "4", "--worker-class", "uvicorn.workers.UvicornWorker", "-b", "0.0.0.0:8888", "-t", "30", "--pythonpath", "/app/FN-Basic-Services", "main:app"]
75+
# CMD ["gunicorn", "-w", "4", "--worker-class", "uvicorn.workers.UvicornWorker", "-b", "0.0.0.0:8888", "-t", "30", "--pythonpath", "/app/FN-Basic-Services", "main:app"]
76+
77+
# docker exec -it fn-basic-docker-api bash

‎README.md‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,34 @@ sudo service k8s_es_api status/stop/start
9696
- Service : http://localhost:8888/docs
9797

9898

99+
100+
101+
### Pytest
102+
- Go to virtual enviroment using `source .venv/bin/activate`
103+
- Run this command manually: `poetry run py.test -v --junitxml=test-reports/junit/pytest.xml --cov-report html --cov tests/` or `./pytest.sh`
104+
```bash
105+
$ ./pytest.sh
106+
tests\test_api.py::test_api [2025-10-23 15:26:04,750] [INFO] [main] [root] /hello
107+
[2025-10-23 15:26:04,759] [INFO] [_client] [_send_single_request] HTTP Request: GET http://testserver/ "HTTP/1.1 200 OK"
108+
PASSED
109+
110+
============================================================= tests coverage ==============================================================
111+
_____________________________________________ coverage: platform win32, python 3.11.7-final-0 _____________________________________________
112+
113+
Name Stmts Miss Cover Missing
114+
----------------------------------------------------
115+
config\log_config.py 32 1 97% 42
116+
injector.py 6 0 100%
117+
main.py 13 0 100%
118+
tests\__init__.py 0 0 100%
119+
tests\conftest.py 8 0 100%
120+
tests\test_api.py 6 0 100%
121+
----------------------------------------------------
122+
TOTAL 65 1 98%
123+
============================================================ 1 passed in 0.23s ============================================================
124+
(.venv)
125+
```
126+
127+
99128
### Kubernetes
100129
- Kubernetes is an open-source container orchestration system that automates the deployment, scaling, and management of containerized applications. It works by providing an API to manage clusters of virtual machines, scheduling containers, and automatically handling tasks like service discovery, load balancing, and self-healing to ensure applications remain available.

‎create_virtual_env.sh‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
#!/bin/bash
2-
set -e
3-
4-
export PYTHONDONTWRITEBYTECODE=1
5-
6-
SCRIPTDIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
7-
8-
VENV=".venv"
9-
10-
function activate_virtual_env() {
11-
# Create virtualenv
12-
python -m venv $SCRIPTDIR/$VENV
13-
14-
# Python 3.11.7 with Window
15-
if [ -d "$VENV/bin" ]; then
16-
source $SCRIPTDIR/$VENV/bin/activate
17-
else
18-
source $SCRIPTDIR/$VENV/Scripts/activate
19-
fi
20-
21-
echo "Created virtual enviroment >>" + $SCRIPTDIR/$VENV/bin/activate
22-
23-
echo "Create Poetry Environment"
24-
# Python 3.11.7 with Window
25-
pip install poetry
26-
poetry install
27-
echo "Finish Poetry Environment Completely.."
28-
}
29-
30-
if [ -d $SCRIPTDIR/$VENV ]; then
31-
echo "VirtualEnv exists."
32-
rm -rf $SCRIPTDIR/$VENV
33-
fi
34-
35-
activate_virtual_env
1+
#!/bin/bash
2+
set -e
3+
4+
export PYTHONDONTWRITEBYTECODE=1
5+
6+
SCRIPTDIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
7+
8+
VENV=".venv"
9+
10+
function activate_virtual_env() {
11+
# Create virtualenv
12+
python -m venv $SCRIPTDIR/$VENV
13+
14+
# Python 3.11.7 with Window
15+
if [ -d "$VENV/bin" ]; then
16+
source $SCRIPTDIR/$VENV/bin/activate
17+
else
18+
source $SCRIPTDIR/$VENV/Scripts/activate
19+
fi
20+
21+
echo "Created virtual enviroment >>" + $SCRIPTDIR/$VENV/bin/activate
22+
23+
echo "Create Poetry Environment"
24+
# Python 3.11.7 with Window
25+
pip install poetry
26+
poetry install
27+
echo "Finish Poetry Environment Completely.."
28+
}
29+
30+
if [ -d $SCRIPTDIR/$VENV ]; then
31+
echo "VirtualEnv exists."
32+
rm -rf $SCRIPTDIR/$VENV
33+
fi
34+
35+
activate_virtual_env

‎docker-build.sh‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
#!/bin/bash
2-
3-
set -eu
4-
5-
#docker build --no-cache \
6-
7-
8-
docker build \
9-
-f "$(dirname "$0")/Dockerfile" \
10-
-t fn-basic-docker-api:es \
11-
--target runtime \
12-
"$(dirname "$0")/."
13-
14-
15-
# docker build \
16-
# -f "$(dirname "$0")/Dockerfile" \
17-
# -t fn-basic-docker-api:test \
18-
# --target test \
19-
# "$(dirname "$0")/."
20-
21-
22-
# docker build \
23-
# -f "$(dirname "$0")/Dockerfile" \
24-
# -t fn-basic-docker-api:omni_es \
25-
# --target omni_es \
1+
#!/bin/bash
2+
3+
set -eu
4+
5+
#docker build --no-cache \
6+
7+
8+
docker build \
9+
-f "$(dirname "$0")/Dockerfile" \
10+
-t fn-basic-docker-api:es \
11+
--target runtime \
12+
"$(dirname "$0")/."
13+
14+
15+
# docker build \
16+
# -f "$(dirname "$0")/Dockerfile" \
17+
# -t fn-basic-docker-api:test \
18+
# --target test \
19+
# "$(dirname "$0")/."
20+
21+
22+
# docker build \
23+
# -f "$(dirname "$0")/Dockerfile" \
24+
# -t fn-basic-docker-api:omni_es \
25+
# --target omni_es \
2626
# "$(dirname "$0")/."

‎docker-run-entrypoints.sh‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
1-
#!/bin/bash
2-
set -ex
3-
4-
# sleep 60
5-
6-
echo "entrypoints.sh"
7-
8-
# --
9-
# Poetry v.
10-
# --
11-
source /app/poetry-venv/bin/activate
12-
cd /app/FN-Basic-Services
13-
14-
# --
15-
# Waitng for ES
16-
# ./wait_for_es.sh $ES_HOST
17-
18-
echo "Runinng"
19-
# poetry run uvicorn main:app --host=0.0.0.0 --port=8888 --workers 4
1+
#!/bin/bash
2+
set -ex
3+
4+
# sleep 60
5+
6+
export PYTHONDONTWRITEBYTECODE=1
7+
8+
echo "entrypoints.sh"
9+
10+
# --
11+
# Poetry v.
12+
# --
13+
source /app/poetry-venv/bin/activate
14+
cd /app/FN-Basic-Services
15+
16+
# --
17+
# Waitng for ES
18+
# ./wait_for_es.sh $ES_HOST
19+
20+
echo "Runinng"
21+
# poetry run uvicorn main:app --host=0.0.0.0 --port=8888 --workers 4
2022
gunicorn -k uvicorn.workers.UvicornWorker main:app --bind 0.0.0.0:8888 --workers 4

‎docker-run-tests.sh‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
1-
#!/bin/bash
2-
set -e
3-
4-
# sleep 60
5-
source /app/poetry-venv/bin/activate
6-
cd /app/FN-Basic-Services
7-
8-
poetry run py.test -v tests --disable-warnings
1+
#!/bin/bash
2+
set -ex
3+
4+
# sleep 60
5+
6+
export PYTHONDONTWRITEBYTECODE=1
7+
8+
echo "entrypoints.sh"
9+
10+
# --
11+
# Poetry v.
12+
# --
13+
source /app/poetry-venv/bin/activate
14+
cd /app/FN-Basic-Services
15+
16+
# py.test -v tests
17+
# py.test -v ./tests --cov-report term-missing --cov
18+
poetry run py.test -sv ./tests --disable-warnings --cov-report term-missing --cov

‎docker-run.sh‎

Lines changed: 60 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,60 @@
1-
#!/bin/bash
2-
3-
set -eu
4-
5-
SCRIPTDIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
6-
7-
# ~ V.7
8-
# docker run --rm -it -d --publish 9292:9201 --expose 9201 \
9-
# -e node.name=fn-platform-omni-data-01 \
10-
# -e discovery.type=single-node \
11-
# -e http.port=9201 \
12-
# -e http.cors.enabled=true \
13-
# -e http.cors.allow-origin=* \
14-
# -e http.cors.allow-headers=X-Requested-With,X-Auth-Token,Content-Type,Content-Length,Authorization \
15-
# -e http.cors.allow-credentials=true \
16-
# -e xpack.security.enabled=false \
17-
# -e bootstrap.system_call_filter=false \
18-
# -e ES_JAVA_OPTS="-Xms1g -Xmx1g" \
19-
# -v "$SCRIPTDIR:/FN-BEES-Services/" \
20-
# fn-platform-basic-api:omni_es
21-
22-
# V.8
23-
# docker run --rm -it -d --publish 9203:9201 --expose 9201 \
24-
# --name fn-platform-omni-data-01 \
25-
# -e node.roles="[data, master]" \
26-
# -e node.name=fn-platform-omni-data-01 \
27-
# -e cluster.name=docker-elasticsearch \
28-
# -e cluster.initial_master_nodes=fn-platform-omni-data-01 \
29-
# -e discovery.seed_hosts=fn-platform-omni-data-01 \
30-
# -e cluster.routing.allocation.disk.threshold_enabled=false \
31-
# -e http.port=9201 \
32-
# -e ES_JAVA_OPTS="-Xms1g -Xmx1g" \
33-
# -e xpack.security.enabled=false \
34-
# -e xpack.security.http.ssl.enabled=false \
35-
# -e xpack.license.self_generated.type=basic \
36-
# -e action.destructive_requires_name=false \
37-
# -v "$SCRIPTDIR:/FN-BEES-Services/" \
38-
# fn-platform-basic-api:omni_es
39-
40-
# docker run --rm -it -d --publish 8888:8888 --expose 8888 \
41-
# --name fn-basic-docker-api \
42-
# -v "$SCRIPTDIR:/FN-BEES-Services/" \
43-
# fn-basic-docker-api:es
44-
45-
docker run --publish 8888:8888 --expose 8888 \
46-
--name fn-basic-docker-api \
47-
-v "$SCRIPTDIR:/FN-BEES-Services/" \
48-
fn-basic-docker-api:es
49-
50-
# docker run --rm --platform linux/amd64 -it -d \
51-
# --name fn-cicd-basic-api --publish 15555:5555 --expose 5555 \
52-
# --network bridge \
53-
# -e ES_HOST=http://host.docker.internal:9203 \
54-
# -v "$SCRIPTDIR:/app/FN-Basic-Services/" \
55-
# fn-cicd-basic-api:es
56-
57-
1+
#!/bin/bash
2+
3+
set -eu
4+
5+
export PYTHONDONTWRITEBYTECODE=1
6+
7+
8+
SCRIPTDIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
9+
10+
# ~ V.7
11+
# docker run --rm -it -d --publish 9292:9201 --expose 9201 \
12+
# -e node.name=fn-platform-omni-data-01 \
13+
# -e discovery.type=single-node \
14+
# -e http.port=9201 \
15+
# -e http.cors.enabled=true \
16+
# -e http.cors.allow-origin=* \
17+
# -e http.cors.allow-headers=X-Requested-With,X-Auth-Token,Content-Type,Content-Length,Authorization \
18+
# -e http.cors.allow-credentials=true \
19+
# -e xpack.security.enabled=false \
20+
# -e bootstrap.system_call_filter=false \
21+
# -e ES_JAVA_OPTS="-Xms1g -Xmx1g" \
22+
# -v "$SCRIPTDIR:/FN-BEES-Services/" \
23+
# fn-platform-basic-api:omni_es
24+
25+
# V.8
26+
# docker run --rm -it -d --publish 9203:9201 --expose 9201 \
27+
# --name fn-platform-omni-data-01 \
28+
# -e node.roles="[data, master]" \
29+
# -e node.name=fn-platform-omni-data-01 \
30+
# -e cluster.name=docker-elasticsearch \
31+
# -e cluster.initial_master_nodes=fn-platform-omni-data-01 \
32+
# -e discovery.seed_hosts=fn-platform-omni-data-01 \
33+
# -e cluster.routing.allocation.disk.threshold_enabled=false \
34+
# -e http.port=9201 \
35+
# -e ES_JAVA_OPTS="-Xms1g -Xmx1g" \
36+
# -e xpack.security.enabled=false \
37+
# -e xpack.security.http.ssl.enabled=false \
38+
# -e xpack.license.self_generated.type=basic \
39+
# -e action.destructive_requires_name=false \
40+
# -v "$SCRIPTDIR:/FN-BEES-Services/" \
41+
# fn-platform-basic-api:omni_es
42+
43+
# docker run --rm -it -d --publish 8888:8888 --expose 8888 \
44+
# --name fn-basic-docker-api \
45+
# -v "$SCRIPTDIR:/FN-BEES-Services/" \
46+
# fn-basic-docker-api:es
47+
48+
docker run --publish 8888:8888 --expose 8888 \
49+
--name fn-basic-docker-api \
50+
-v "$SCRIPTDIR:/FN-BEES-Services/" \
51+
fn-basic-docker-api:es
52+
53+
# docker run --rm --platform linux/amd64 -it -d \
54+
# --name fn-cicd-basic-api --publish 15555:5555 --expose 5555 \
55+
# --network bridge \
56+
# -e ES_HOST=http://host.docker.internal:9203 \
57+
# -v "$SCRIPTDIR:/app/FN-Basic-Services/" \
58+
# fn-cicd-basic-api:es
59+
60+

0 commit comments

Comments
 (0)