Skip to content

Commit

Permalink
Update containers and deployment tests
Browse files Browse the repository at this point in the history
  • Loading branch information
giffels committed Nov 8, 2024
1 parent dbb0722 commit 1a091b4
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 29 deletions.
22 changes: 0 additions & 22 deletions containers/cobald-tardis-deployment-test-env/Dockerfile.centos7

This file was deleted.

11 changes: 6 additions & 5 deletions containers/cobald-tardis-htcondor/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,22 @@ 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 \
&& 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

WORKDIR /srv

Expand Down
2 changes: 1 addition & 1 deletion containers/cobald-tardis/Dockerfile
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
2 changes: 1 addition & 1 deletion docs/source/changelog.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. Created by changelog.py at 2024-10-21, command
.. Created by changelog.py at 2024-11-08, command
'/Users/giffler/.cache/pre-commit/repoecmh3ah8/py_env-python3.12/bin/changelog docs/source/changes compile --categories Added Changed Fixed Security Deprecated --output=docs/source/changelog.rst'
based on the format of 'https://keepachangelog.com/'
Expand Down

0 comments on commit 1a091b4

Please sign in to comment.