Switch to docker image with python3

darwinproject · Aug 7, 2024 · f256a2c · f256a2c
1 parent a9e81b6
commit f256a2c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/build_testing.yml b/.github/workflows/build_testing.yml
@@ -38,8 +38,8 @@ jobs:
 
      - name: Get a docker image and set it running
        run: |
-         docker pull mitgcm/testreport-images:ubuntu_18_04_villon
-         docker run  -v `pwd`:/MITgcm --name ubuntu_18_04-testreport -t -d mitgcm/testreport-images:ubuntu_18_04_villon /bin/bash
+         docker pull oliverjahn/testreport-images:ubuntu_18_04_villon
+         docker run  -v `pwd`:/MITgcm --name ubuntu_18_04-testreport -t -d oliverjahn/testreport-images:ubuntu_18_04_villon /bin/bash
 
      - name: Run a test
        env:
@@ -64,8 +64,8 @@ jobs:
 
      - name: Get a docker image and set it running
        run: |
-         docker pull mitgcm/mitgcm-openad-test:centos-test
-         docker run -i -t -v `pwd`:/MITgcm -d --name openad-testing --ulimit stack=-1:-1 --rm mitgcm/mitgcm-openad-test:centos-test /bin/bash
+         docker pull oliverjahn/mitgcm-openad-test:centos-test
+         docker run -i -t -v `pwd`:/MITgcm -d --name openad-testing --ulimit stack=-1:-1 --rm oliverjahn/mitgcm-openad-test:centos-test /bin/bash
 
      - name: Run testreport
        env:
@@ -100,8 +100,8 @@ jobs:
 
      - name: Get a docker image and set it running
        run: |
-         docker pull mitgcm/mitgcm-openad-test:centos-test
-         docker run -i -t -v `pwd`:/MITgcm -d --name openad-testing --ulimit stack=-1:-1 --rm mitgcm/mitgcm-openad-test:centos-test /bin/bash
+         docker pull oliverjahn/mitgcm-openad-test:centos-test
+         docker run -i -t -v `pwd`:/MITgcm -d --name openad-testing --ulimit stack=-1:-1 --rm oliverjahn/mitgcm-openad-test:centos-test /bin/bash
 
      - name: Run testreport
        env:

diff --git a/tools/ci/docker/centos/Dockerfile b/tools/ci/docker/centos/Dockerfile
@@ -1,8 +1,12 @@
 FROM centos:centos7
 LABEL [email protected]
 
-RUN yum -y update; yum clean all
-RUN yum -y install epel-release wget csh; yum clean all
+RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
+RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
+RUN yum -y update
+RUN yum clean all
+RUN yum -y install epel-release wget csh python3
+RUN yum clean all
 RUN yum -y groupinstall "Development Tools"
 RUN cd /root; wget http://www.mcs.anl.gov/%7Eutke/OpenAD_tars/493/OpenAD_2014-03-15.tgz; tar -xzvf OpenAD_2014-03-15.tgz
 COPY pfile /root/pfile

diff --git a/tools/ci/docker/ubuntu_18_04_villon/Dockerfile b/tools/ci/docker/ubuntu_18_04_villon/Dockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu:18.04
 LABEL [email protected]
 
-RUN apt-get -y update && apt-get -y install make git gfortran libnetcdff-dev python
+RUN apt-get -y update && apt-get -y install make git gfortran libnetcdff-dev python python3