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

Update COBalD/TARDIS containers #356

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update COBalD/TARDIS containers #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
afdc061
Update containers and deployment tests
giffels Nov 8, 2024
cc1209e
Fix using wrong python version
giffels Dec 11, 2024
6725007
Add slurm client to container for C2PAP setup
giffels Dec 11, 2024
a362de1
Add addtional plugins and tools to the container for PUNCH4NFDI
giffels Dec 11, 2024
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
22 changes: 0 additions & 22 deletions containers/cobald-tardis-deployment-test-env/Dockerfile.centos7
View file
Open in desktop

This file was deleted.

16 changes: 10 additions & 6 deletions containers/cobald-tardis-htcondor/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,29 @@ ARG SOURCE_BRANCH=master
ARG SOURCE_REPO_URL=https://github.com/MatterMiners/tardis

RUN rpm --import http://research.cs.wisc.edu/htcondor/yum/RPM-GPG-KEY-HTCondor
RUN dnf install -y https://research.cs.wisc.edu/htcondor/repo/10/10.0/htcondor-release-current.el8.noarch.rpm
RUN dnf install -y https://research.cs.wisc.edu/htcondor/repo/23.x/el8/x86_64/release/htcondor-release-23.x-1.el8.noarch.rpm

RUN dnf -y install epel-release && dnf clean all
RUN dnf config-manager --set-enabled powertools

RUN dnf -y update \
&& dnf -y install condor \
git \
python39 \
python3.11 \
gcc \
python39-devel \
python3.11-devel \
python3.11-pip \
slurm \
&& dnf clean all

RUN python3.9 -m pip install --no-cache-dir --upgrade pip \
&& python3.9 -m pip install --no-cache-dir git+$SOURCE_REPO_URL@$SOURCE_BRANCH
RUN python3.11 -m pip install --no-cache-dir --upgrade pip \
&& python3.11 -m pip install --no-cache-dir git+$SOURCE_REPO_URL@$SOURCE_BRANCH \
&& python3.11 -m pip install --no-cache-dir cobald-hep-plugins \
&& python3.11 -m pip install --no-cache-dir htcondor-queue-poller

WORKDIR /srv

COPY cobald.yml /srv/cobald.yml

ENTRYPOINT ["python3.9", "-m", "cobald.daemon"]
ENTRYPOINT ["python3.11", "-m", "cobald.daemon"]
CMD ["/srv/cobald.yml"]
2 changes: 1 addition & 1 deletion containers/cobald-tardis/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-alpine
FROM python:3.11-alpine
LABEL maintainer="Manuel Giffels <[email protected]>"
ARG SOURCE_BRANCH=master
ARG SOURCE_REPO_URL=https://github.com/MatterMiners/tardis
Expand Down
Loading