back to focal as the base distro

pdidev · Jun 17, 2024 · dff6ebf · dff6ebf
1 parent 750034b
commit dff6ebf
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/debuntu_docker_images.yml b/.github/workflows/debuntu_docker_images.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        base: ['ubuntu/jammy', 'ubuntu/rolling', 'debian/oldstable', 'debian/unstable']
+        base: ['ubuntu/focal', 'ubuntu/rolling', 'debian/oldstable', 'debian/unstable']
         mpi: ['openmpi', 'mpich']
         variant: ['mini', 'all', 'pdi']
     runs-on: ubuntu-latest
@@ -27,7 +27,7 @@ jobs:
         echo "distro=${BASE%/*}" >> "${GITHUB_OUTPUT}"
         echo "distro_version=${BASE##*/}" >> "${GITHUB_OUTPUT}"
     - name: "Build and push"
-      uses: pdidev/test_env/.github/actions/build@vdeps
+      uses: pdidev/test_env/.github/actions/build@main
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: debuntu/${{ matrix.variant }}

diff --git a/.github/workflows/spack_docker_images.yml b/.github/workflows/spack_docker_images.yml
@@ -11,14 +11,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: "Build and push 1a-base"
-      uses: pdidev/test_env/.github/actions/build@vdeps
+      uses: pdidev/test_env/.github/actions/build@main
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/1a-base
         image-name: base
         cache: ${{ github.event_name != 'schedule' }}
     - name: "Build and push 1b-spackbase"
-      uses: pdidev/test_env/.github/actions/build@vdeps
+      uses: pdidev/test_env/.github/actions/build@main
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/1b-spackbase
@@ -33,7 +33,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: "Build and push 2a-precomp"
-      uses: pdidev/test_env/.github/actions/build@vdeps
+      uses: pdidev/test_env/.github/actions/build@main
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/2a-precomp
@@ -42,7 +42,7 @@ jobs:
           VERSION=${{ matrix.version }}
           COMPILER=${{ matrix.compiler }}
     - name: "Build and push 2b-compiler"
-      uses: pdidev/test_env/.github/actions/build@vdeps
+      uses: pdidev/test_env/.github/actions/build@main
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/2b-compiler
@@ -51,7 +51,7 @@ jobs:
           VERSION=${{ matrix.version }}
           COMPILER=${{ matrix.compiler }}
     - name: "Build and push 2c-squash"
-      uses: pdidev/test_env/.github/actions/build@vdeps
+      uses: pdidev/test_env/.github/actions/build@main
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/2c-squash
@@ -69,7 +69,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: "Build and push 3a-precomp"
-      uses: pdidev/test_env/.github/actions/build@vdeps
+      uses: pdidev/test_env/.github/actions/build@main
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/3a-precomp
@@ -78,7 +78,7 @@ jobs:
           VERSION=${{ matrix.version }}
           COMPILER=${{ matrix.compiler }}
     - name: "Build and push 3b-compiler"
-      uses: pdidev/test_env/.github/actions/build@vdeps
+      uses: pdidev/test_env/.github/actions/build@main
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/3b-compiler
@@ -87,7 +87,7 @@ jobs:
           VERSION=${{ matrix.version }}
           COMPILER=${{ matrix.compiler }}
     - name: "Build and push 3c-squash"
-      uses: pdidev/test_env/.github/actions/build@vdeps
+      uses: pdidev/test_env/.github/actions/build@main
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/3c-squash
@@ -96,7 +96,7 @@ jobs:
           VERSION=${{ matrix.version }}
           COMPILER=${{ matrix.compiler }}
     - name: "Build and push 4a-baselibs"
-      uses: pdidev/test_env/.github/actions/build@vdeps
+      uses: pdidev/test_env/.github/actions/build@main
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/4a-baselibs
@@ -105,7 +105,7 @@ jobs:
           VERSION=${{ matrix.version }}
           COMPILER=${{ matrix.compiler }}
     - name: "Build and push 4b-squash"
-      uses: pdidev/test_env/.github/actions/build@vdeps
+      uses: pdidev/test_env/.github/actions/build@main
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/4b-squash
@@ -124,7 +124,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: "Build and push 5a-mpi"
-      uses: pdidev/test_env/.github/actions/build@vdeps
+      uses: pdidev/test_env/.github/actions/build@main
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/5a-mpi
@@ -134,7 +134,7 @@ jobs:
           COMPILER=${{ matrix.compiler }}
           MPI=${{ matrix.mpi }}
     - name: "Build and push spack/5b-squash"
-      uses: pdidev/test_env/.github/actions/build@vdeps
+      uses: pdidev/test_env/.github/actions/build@main
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/5b-squash
@@ -144,7 +144,7 @@ jobs:
           COMPILER=${{ matrix.compiler }}
           MPI=${{ matrix.mpi }}
     - name: "Build and push 6-optlibs"
-      uses: pdidev/test_env/.github/actions/build@vdeps
+      uses: pdidev/test_env/.github/actions/build@main
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/6-optlibs
@@ -172,7 +172,7 @@ jobs:
           echo "tags=ghcr.io/pdidev/spack/${{ matrix.version }}/${{ matrix.compiler }}/${{ matrix.mpi }}/${{ matrix.level }}:${{github.ref_name}}" >> "${GITHUB_OUTPUT}"
         fi
     - name: "Build and push"
-      uses: pdidev/test_env/.github/actions/build@vdeps
+      uses: pdidev/test_env/.github/actions/build@main
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/7-finalize

diff --git a/spack/1a-base/Dockerfile b/spack/1a-base/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:20.04
 
 LABEL "org.opencontainers.image.source"="https://github.com/pdidev/test_env"
 
@@ -25,7 +25,7 @@ RUN set -ex \
  && apt-get install -y --no-install-recommends \
             environment-modules \
             gfortran \
-            libstdc++-9-dev \
+            libstdc++-7-dev \
             make \
             tcl \
  && apt-get autoremove -y \