NCAR · mattldawson · Oct 5, 2023 · Oct 5, 2023
diff --git a/.github/workflows/gh_pages.yml b/.github/workflows/gh_pages.yml
@@ -53,7 +53,7 @@ jobs:
 
           # create two copies of the documentaiton
           # 1. the frozen version, represented as vX.X in the version switcher
-          docker build -t micm -f Dockerfile.docs .
+          docker build -t micm -f docker/Dockerfile.docs .
           id=$(docker create micm)
           docker cp $id:/build/docs/sphinx tmpdocs
           docker rm -v $id
@@ -62,7 +62,7 @@ jobs:
 
           # 2. stable, represented as vX.X (stable) in the version switcher
           # edit conf.py to produce a version string that looks like vX.X (stable)
-          docker build -t micm -f Dockerfile.docs --build-arg SUFFIX=" (stable)" .
+          docker build -t micm -f docker/Dockerfile.docs --build-arg SUFFIX=" (stable)" .
           id=$(docker create micm)
           docker cp $id:/build/docs/sphinx tmpdocs
           docker rm -v $id
@@ -83,7 +83,7 @@ jobs:
           !contains(github.ref, env.DEFAULT_BRANCH)
         run: |
           set -x
-          docker build -t micm -f Dockerfile.docs .
+          docker build -t micm -f docker/Dockerfile.docs .
           id=$(docker create micm)
           docker cp $id:/build/docs/sphinx tmpdocs
           docker rm -v $id

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -28,7 +28,7 @@ jobs:
           submodules: recursive
 
       - name: Build Docker image
-        run: docker build -t micm -f ${{ matrix.dockerfile }} .
+        run: docker build -t micm -f docker/${{ matrix.dockerfile }} .
 
       - name: Run tests in container
         if: matrix.dockerfile != 'Dockerfile.coverage'

diff --git a/README.md b/README.md
@@ -58,7 +58,7 @@ To build the latest pre-release version of MICM, instead run:
 ```
 git clone https://github.com/NCAR/micm.git
 cd micm
-docker build -t micm .
+docker build -t micm -f docker/Dockerfile .
 docker run -it micm bash
 ```
 

diff --git a/Dockerfile → docker/Dockerfile b/Dockerfile → docker/Dockerfile
diff --git a/Dockerfile.coverage → docker/Dockerfile.coverage b/Dockerfile.coverage → docker/Dockerfile.coverage
diff --git a/Dockerfile.docs → docker/Dockerfile.docs b/Dockerfile.docs → docker/Dockerfile.docs
diff --git a/Dockerfile.intel → docker/Dockerfile.intel b/Dockerfile.intel → docker/Dockerfile.intel
diff --git a/Dockerfile.llvm → docker/Dockerfile.llvm b/Dockerfile.llvm → docker/Dockerfile.llvm
diff --git a/Dockerfile.memcheck → docker/Dockerfile.memcheck b/Dockerfile.memcheck → docker/Dockerfile.memcheck
diff --git a/Dockerfile.mpi → docker/Dockerfile.mpi b/Dockerfile.mpi → docker/Dockerfile.mpi
diff --git a/Dockerfile.no_json → docker/Dockerfile.no_json b/Dockerfile.no_json → docker/Dockerfile.no_json
diff --git a/Dockerfile.nvhpc → docker/Dockerfile.nvhpc b/Dockerfile.nvhpc → docker/Dockerfile.nvhpc
diff --git a/Dockerfile.openmp → docker/Dockerfile.openmp b/Dockerfile.openmp → docker/Dockerfile.openmp
diff --git a/docs/source/getting_started.rst b/docs/source/getting_started.rst
@@ -47,7 +47,7 @@ Docker Container
 
 Build and run the image::
 
-    $ docker build -t micm -f Dockerfile.nvhpc .
+    $ docker build -t micm -f docker/Dockerfile.nvhpc .
     $ docker run --rm -it micm
 
 If you would like, you can ssh into a running docker container and edit the files there.