fix apt installs in conda stage, add combinations to matrices

bquan0 · Nov 22, 2023 · 18629fd · 18629fd
1 parent d001785
commit 18629fd
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml
@@ -30,7 +30,11 @@ jobs:
         hdf5: ['']
         hdf5_build_arg: ['NO']
         include:
-          - hdf5: _hdf5
+          - pkg_mgr: 'apt'
+            hdf5: _hdf5
+            hdf5_build_arg: hdf5-1_12_0
+          - pkg_mgr: 'conda'
+            hdf5: _hdf5
             hdf5_build_arg: hdf5-1_12_0
       fail-fast: false
 
@@ -75,7 +79,12 @@ jobs:
         hdf5: ['']
         hdf5_build_arg: ['NO']
         include:
-          - pyne_test_base: dagmc
+          - pkg_mgr: 'apt'
+            pyne_test_base: dagmc
+            hdf5: _hdf5
+            hdf5_build_arg: hdf5-1_12_0
+          - pkg_mgr: 'conda'
+            pyne_test_base: dagmc
             hdf5: _hdf5
             hdf5_build_arg: hdf5-1_12_0
       fail-fast: false
@@ -121,7 +130,11 @@ jobs:
         stage: [base_python, moab, dagmc, openmc]
         hdf5: ['']
         include:
-          - stage: dagmc
+          - pkg_mgr: 'apt'
+            stage: dagmc
+            hdf5: _hdf5
+          - pkg_mgr: 'apt'
+            stage: dagmc
             hdf5: _hdf5
 
     name: "ghcr.io/${{ github.repository_owner }}/pyne_ubuntu_22.04_py3_${{ matrix.pkg_mgr }}${{ matrix.hdf5 }}/${{ matrix.stage }}: latest -> stable"

diff --git a/docker/ubuntu_22.04-dev.dockerfile b/docker/ubuntu_22.04-dev.dockerfile
@@ -42,11 +42,11 @@ RUN apt-get update \
             progress
 
 FROM common_base AS conda_deps
-RUN apt install -y \
+RUN apt-get install -y --fix-missing \
         wget \
         bzip2 \
         ca-certificates \
-    && apt clean -y all
+    && apt-get clean -y
 
 RUN echo 'export PATH=/opt/conda/bin:$PATH' > /etc/profile.d/conda.sh && \
     wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh && \