Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft for slim containers #386

Closed
wants to merge 19 commits into from
Closed

Draft for slim containers #386

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
b7010f1
Draft for slim containers
joschrew Jul 7, 2023
5e71acf
Change submodule core head, for now
joschrew Jul 12, 2023
2fb2347
Use core Dockerfile from submodule
joschrew Jul 12, 2023
fa2a477
Remove metspath-check from delegator-template
joschrew Jul 12, 2023
7736969
Make port for processing server dynamic
joschrew Jul 13, 2023
e866117
Make delegator blocking with a waiting http server
joschrew Jul 19, 2023
10725b9
Get processor name in delegator from argv
joschrew Jul 19, 2023
c6da76e
Don't publish docker ports for mongo
joschrew Jul 20, 2023
2526006
Don't publish docker ports for mongodb and rabbitmq
joschrew Jul 20, 2023
3ca07bd
Remove redundant call from Makefile-slim
joschrew Jul 20, 2023
b001777
Update env-var-handling for rabbitmq 1
joschrew Jul 20, 2023
1047ba2
Update env-var-handling for rabbitmq 2
joschrew Jul 20, 2023
ab2d1c3
Update env-var-handling for mongodb 1
joschrew Jul 20, 2023
7834686
Update env-var-handling for mongodb 2
joschrew Jul 20, 2023
d53366c
Fix env-var-handling for mongodb and rabbitmq
joschrew Jul 20, 2023
c6e67d6
Generate ps-config dynamically with .env settings
joschrew Jul 21, 2023
cfd1a79
Read port for delegator from .env
joschrew Jul 27, 2023
7ce6096
Revert last commit: read port from .env"
joschrew Aug 1, 2023
a7c1328
Read and set .env when activating venv
joschrew Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile-slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ slim-venv: docker-compose.yaml .env $(DELEGATORS) | $(VIRTUAL_ENV)

# create a delegator to the processing server for the processor
$(BIN)/ocrd-%: | $(VIRTUAL_ENV)
@sed -e "s/{{\s*OCRD_PS_PORT\s*}}/$(OCRD_PS_PORT)/" slim-containers-files/delegator_template.py > $@;
@sed -e "s|{{\s*OCRD_SLIM_ENV_PATH\s*}}|$(CURDIR)/.env|" slim-containers-files/delegator_template.py > $@;
@chmod u+x $@


Expand Down
11 changes: 10 additions & 1 deletion slim-containers-files/delegator_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,17 @@
import subprocess
from http.server import BaseHTTPRequestHandler, HTTPServer
from os.path import basename
import re
from pathlib import Path

processing_server_address = "http://localhost:{{ OCRD_PS_PORT }}"
env_path = "{{ OCRD_SLIM_ENV_PATH }}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe use https://github.com/theskumar/python-dotenv for that, so you don't have to parse sh variable assignments?

try:
port = re.search(r"OCRD_PS_PORT=(?P<port>[0-9]+)",
Path(f'{env_path}').read_text()).group('port')
except:
raise ValueError("Variable OCRD_PS_PORT not found in .env")

processing_server_address = f"http://localhost:{port}"
processor_name = basename(sys.argv[0])

STOP_WAITING_SERVER = False
Expand Down