Merge pull request #165 from fusion-energy/develop

split docker file
fusion-energy · Dec 27, 2022 · 6a48824 · 6a48824
2 parents cc1be6c + 1898916
commit 6a48824
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 54 deletions.
diff --git a/Dockerfile → .devcontainer/Dockerfile b/Dockerfile → .devcontainer/Dockerfile
@@ -36,59 +36,12 @@
 # docker run -p 8888:8888 -v ${PWD}/tasks neutronics-workshop
 
 # This can't be done currently as the base images uses conda installs for moab / dagmc which don't compile with OpenMC
-# FROM ghcr.io/openmc-data-storage/miniconda3_4.10.3_endfb-7.1_nndc_tendl_2019:latest as dependencies
-FROM mcr.microsoft.com/vscode/devcontainers/miniconda:0-3 as dependencies
-
-
+FROM ghcr.io/fusion-energy/neutronics-workshop-base:latest
 
 ARG compile_cores=1
 ARG include_avx=true
 ARG build_double_down=OFF
 
-RUN apt-get --allow-releaseinfo-change update
-RUN apt-get --yes update && apt-get --yes upgrade
-
-# perhaps libnetcdf13 is needed for unstructured meshes in openmc
-# RUN apt-get --yes install libnetcdf13
-
-                          # eigen3 needed for DAGMC
-RUN apt-get --yes install libeigen3-dev \
-                        #   sudo  \
-                          # sudo is needed during the NJOY install
-                          git \
-                          wget \
-                          gfortran \
-                          g++ \
-                          mpich \
-                          libmpich-dev \
-                          libhdf5-serial-dev \
-                          libhdf5-mpich-dev \
-                          hdf5-tools \
-                          imagemagick \
-                          cmake \
-                          # libnetcdf-dev is needed to allow NETCDF on MOAB which helps with tet meshes in OpenMC
-                          libnetcdf-dev \
-                          # libtbb-dev required for DAGMC
-                          libtbb-dev \
-                          # libglfw3-dev required for DAGMC
-                          libglfw3-dev \
-                          # needed for CadQuery functionality
-                          libgl1-mesa-glx \
-                          # needed for CadQuery functionality
-                          libgl1-mesa-dev \
-                          # needed for CadQuery functionality
-                          libglu1-mesa-dev \
-                          # needed for CadQuery functionality
-                          freeglut3-dev \
-                          # needed for CadQuery functionality
-                          libosmesa6 \
-                          # needed for CadQuery functionality
-                          libosmesa6-dev \
-                          # needed for CadQuery functionality
-                          libgles2-mesa-dev \
-                          # needed for Gmsh functionality
-                          libxft2
-
 # installing cadquery and jupyter
 RUN conda install -c conda-forge -c python python=3.8
 

diff --git a/.devcontainer/base.Dockerfile b/.devcontainer/base.Dockerfile
@@ -0,0 +1,46 @@
+FROM mcr.microsoft.com/vscode/devcontainers/miniconda:0-3 as dependencies
+
+RUN apt-get --allow-releaseinfo-change update
+RUN apt-get --yes update && apt-get --yes upgrade
+
+# perhaps libnetcdf13 is needed for unstructured meshes in openmc
+# RUN apt-get --yes install libnetcdf13
+
+                          # eigen3 needed for DAGMC
+RUN apt-get --yes install libeigen3-dev \
+                        #   sudo  \
+                          # sudo is needed during the NJOY install
+                          git \
+                          wget \
+                          gfortran \
+                          g++ \
+                          mpich \
+                          libmpich-dev \
+                          libhdf5-serial-dev \
+                          libhdf5-mpich-dev \
+                          hdf5-tools \
+                          imagemagick \
+                          cmake \
+                          # libnetcdf-dev is needed to allow NETCDF on MOAB which helps with tet meshes in OpenMC
+                          libnetcdf-dev \
+                          # libtbb-dev required for DAGMC
+                          libtbb-dev \
+                          # libglfw3-dev required for DAGMC
+                          libglfw3-dev \
+                          # needed for CadQuery functionality
+                          libgl1-mesa-glx \
+                          # needed for CadQuery functionality
+                          libgl1-mesa-dev \
+                          # needed for CadQuery functionality
+                          libglu1-mesa-dev \
+                          # needed for CadQuery functionality
+                          freeglut3-dev \
+                          # needed for CadQuery functionality
+                          libosmesa6 \
+                          # needed for CadQuery functionality
+                          libosmesa6-dev \
+                          # needed for CadQuery functionality
+                          libgles2-mesa-dev \
+                          # needed for Gmsh functionality
+                          libxft2
+
diff --git a/.github/workflows/docker-publish-dev.yml → .github/workflows/docker-publish-base.yml b/.github/workflows/docker-publish-dev.yml → .github/workflows/docker-publish-base.yml
@@ -2,7 +2,7 @@
 # This Action will build and upload a Docker image to GHCR
 # https://github.com/marketplace/actions/publish-docker
 
-name: docker-publish-dev
+name: docker-publish-base
 
 on:
   workflow_dispatch:
@@ -29,10 +29,8 @@ jobs:
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v2
+        file: .devcontainer/base.Dockerfile
         with:
           push: true
-          tags: ghcr.io/fusion-energy/neutronics-workshop:dev
-          build-args: |
-            include_avx=false
-            build_double_down=OFF
-            compile_cores=2
+          tags: ghcr.io/fusion-energy/neutronics-workshop-base
+