Skip to content

Commit

Permalink
Update TARDIS containers to newer OS and python versions
Browse files Browse the repository at this point in the history
  • Loading branch information
giffels committed Jul 27, 2023
1 parent 327ac95 commit 53b695e
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
23 changes: 12 additions & 11 deletions containers/cobald-tardis-htcondor/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
FROM centos:7
FROM rockylinux:8
LABEL maintainer="Manuel Giffels <giffels@gmail.com>"

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 yum install -y https://research.cs.wisc.edu/htcondor/repo/9.0/htcondor-release-current.el7.noarch.rpm
RUN dnf install -y https://research.cs.wisc.edu/htcondor/repo/10/10.0/htcondor-release-current.el8.noarch.rpm

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

RUN yum -y update \
&& yum -y install condor \
RUN dnf -y update \
&& dnf -y install condor \
git \
python3 \
python39 \
gcc \
python3-devel \
&& yum clean all
python39-devel \
&& dnf clean all

RUN python3 -m pip install --no-cache-dir --upgrade pip \
&& python3 -m pip install --no-cache-dir git+$SOURCE_REPO_URL@$SOURCE_BRANCH
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

WORKDIR /srv

COPY cobald.yml /srv/cobald.yml

ENTRYPOINT ["python3", "-m", "cobald.daemon"]
ENTRYPOINT ["python3.9", "-m", "cobald.daemon"]
CMD ["/srv/cobald.yml"]
4 changes: 2 additions & 2 deletions containers/cobald-tardis/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM python:3.8-alpine
MAINTAINER Manuel Giffels <giffels@gmail.com>
FROM python:3.10-alpine
LABEL maintainer="Manuel Giffels <giffels@gmail.com>"
ARG SOURCE_BRANCH=master
ARG SOURCE_REPO_URL=https://github.com/MatterMiners/tardis

Expand Down

0 comments on commit 53b695e

Please sign in to comment.