Skip to content

Commit

Permalink
Merge pull request #30 from SWIFT-HEP/se_2023_09
Browse files Browse the repository at this point in the history
Corrections for next release
  • Loading branch information
kreczko authored Sep 13, 2023
2 parents b433d4f + ab8bd1c commit 3d5e0c7
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
5 changes: 5 additions & 0 deletions docker/cms_agc/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM python:3.10.9-slim-bullseye

SHELL ["/bin/bash", "-c"]

RUN pip3 install --no-cache-dir -r https://raw.githubusercontent.com/SWIFT-HEP/analysis-grand-challenge/main/analyses/cms-open-data-ttbar/requirements.txt
7 changes: 5 additions & 2 deletions src/dask_dirac/_dask.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ def __init__(
if owner_group is None:
owner_group = "dteam_user"

public_address = get("https://ifconfig.me", timeout=30).content.decode("utf8")
# public_address = get("https://ifconfig.me", timeout=30).content.decode("utf8")
public_address = get("https://v4.ident.me/", timeout=30).content.decode("utf8")
singularity_args = f"exec --cleanenv docker://sameriksen/dask:python3.10.9 dask worker tcp://{public_address}:8786"
jdl_template = """
JobName = "dask-dirac: dask worker";
Expand All @@ -73,7 +74,9 @@ def __init__(
singularity_args += _get_site_ports(dirac_site)
jdl_template += f"""
Site = {dirac_site!r};
""".lstrip()
""".lstrip().replace(
"'", '"'
)

# Write JDL
with open(jdl_file, mode="w", encoding="utf-8") as jdl:
Expand Down

0 comments on commit 3d5e0c7

Please sign in to comment.