Update containers and deployment tests

MatterMiners · Nov 8, 2024 · b078307 · b078307
1 parent dbb0722
commit b078307
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 31 deletions.
diff --git a/.github/workflows/deployment-tests.yml b/.github/workflows/deployment-tests.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        os_container: ['rockylinux8', 'rockylinux9', 'ubuntu20_04', 'ubuntu22_04']
+        os_container: ['rockylinux8', 'rockylinux9', 'ubuntu20_04', 'ubuntu22_04', 'ubuntu24_04']
     steps:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        os_container: ['rockylinux8', 'rockylinux9', 'ubuntu20_04', 'ubuntu22_04']
+        os_container: ['rockylinux8', 'rockylinux9', 'ubuntu20_04', 'ubuntu22_04', 'ubuntu_24_04']
     container: matterminers/cobald-tardis-deployment-test-env:${{ matrix.os_container }}
     steps:
       - uses: actions/checkout@v4

diff --git a/containers/cobald-tardis-deployment-test-env/Dockerfile.centos7 b/containers/cobald-tardis-deployment-test-env/Dockerfile.centos7
diff --git a/containers/cobald-tardis-deployment-test-env/Dockerfile.ubuntu24_04 b/containers/cobald-tardis-deployment-test-env/Dockerfile.ubuntu24_04
@@ -0,0 +1,17 @@
+FROM ubuntu:24.04
+LABEL maintainer="Manuel Giffels <[email protected]>"
+
+RUN apt-get update && apt-get upgrade -y \
+    && apt-get install -y gcc g++ make curl dirmngr \
+    apt-transport-https lsb-release ca-certificates \
+    python3 python3-pip language-pack-en git\
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
+
+RUN apt-get install -y nodejs \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+SHELL [ "/bin/bash", "--noprofile", "--norc", "-e", "-o", "pipefail", "-c" ]
diff --git a/containers/cobald-tardis-htcondor/Dockerfile b/containers/cobald-tardis-htcondor/Dockerfile
@@ -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
 

diff --git a/containers/cobald-tardis/Dockerfile b/containers/cobald-tardis/Dockerfile
@@ -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

diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -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/'