Beginning of njoy2016 Docker images.

m-fleming · Jan 24, 2018 · 634ca79 · 634ca79
1 parent 1c33d9b
commit 634ca79
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -1,7 +1,10 @@
 # Docker-images
 Dockerfiles used to create Docker images used in NJOY development and testing. 
 
-The images created by these `Dockerfile`s are hosted publicly at [https://hub.docker.com/r/njoy21/njoy/].
+## Images
+The images created by these `Dockerfile`s are hosted publicly at [https://hub.docker.com/r/njoy21/] under the njoy21 organization. There are a few different repositories under the njoy21 organization:
+- [njoy](njoy/README.md)
+- [NJOY2016](njoy2016/README.md)
 
 ## LICENSE
 This software is distributed according to the terms specified in the [LICENSE](LICENSE) file.
diff --git a/njoy/README.md b/njoy/README.md
@@ -0,0 +1,12 @@
+# NJOY Docker images
+Here are the Dockerfiles that create the base Docker images used in NJOY development and testing. All of these are in the `njoy21/njoy` repository, but there are different "tags"
+
+- `base`: 
+  This is the `njoy21/njoy:base` Docker image. As it's name indicates, it is the base for every other image. Here we have the following installed:
+  - gcc 6.4.0
+  - Python 3.4
+  - CMake 3.2
+
+- `llvm`:
+  This is the `njoy21/njoy:llvm` Docker image and is based on `njoy21/njoy:base`. This images adds the following:
+  - llvm 3.8
diff --git a/base/Dockerfile → njoy/base/Dockerfile b/base/Dockerfile → njoy/base/Dockerfile
diff --git a/llvm/Dockerfile → njoy/llvm/Dockerfile b/llvm/Dockerfile → njoy/llvm/Dockerfile
diff --git a/njoy2016/23/Dockerfile b/njoy2016/23/Dockerfile
@@ -0,0 +1,4 @@
+FROM njoy21/njoy:llvm
+
+LABEL maintainer="Jeremy Lloyd Conlin [email protected]"
+
diff --git a/njoy2016/README.md b/njoy2016/README.md
@@ -0,0 +1,7 @@
+# NJOY2016 Docker images
+Here are the Dockerfiles that have NJOY2016 installed and ready to go. All of these images are in the `njoy21/njoy2016` repository, but there are different "tags"
+
+- `23`:
+  This is the version NJOY2016.23 associated with the git tag `2016.23`.
+
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		FROM njoy21/njoy:llvm

		LABEL maintainer="Jeremy Lloyd Conlin [email protected]"