Merge pull request #1 from tiangolo/refactor-conda-tag-names

🎨 Refactor tag names prefixed with conda to no prefix

README.md

@@ -3,12 +3,12 @@
 
 ## Supported tags and respective `Dockerfile` links
 
-* [`conda-python3.7`, `latest` _(Dockerfile)_](https://github.com/tiangolo/python-machine-learning-docker/blob/master/conda-python3.7/Dockerfile)
-* [`conda-python3.6` _(Dockerfile)_](https://github.com/tiangolo/python-machine-learning-docker/blob/master/conda-python3.6/Dockerfile)
-* [`conda-cuda9.1-python3.7` _(Dockerfile)_](https://github.com/tiangolo/python-machine-learning-docker/blob/master/conda-cuda9.1-python3.7/Dockerfile)
-* [`conda-cuda9.1-python3.6` _(Dockerfile)_](https://github.com/tiangolo/python-machine-learning-docker/blob/master/conda-cuda9.1-python3.6/Dockerfile)
-* [`conda-python3.6-tensorflow` _(Dockerfile)_](https://github.com/tiangolo/python-machine-learning-docker/blob/master/conda-python3.6-tensorflow/Dockerfile)
-* [`conda-cuda9.1-python3.6-tensorflow` _(Dockerfile)_](https://github.com/tiangolo/python-machine-learning-docker/blob/master/conda-cuda9.1-python3.6-tensorflow/Dockerfile)
+* [`python3.7`, `latest` _(Dockerfile)_](https://github.com/tiangolo/python-machine-learning-docker/blob/master/python3.7/Dockerfile)
+* [`python3.6` _(Dockerfile)_](https://github.com/tiangolo/python-machine-learning-docker/blob/master/python3.6/Dockerfile)
+* [`cuda9.1-python3.7` _(Dockerfile)_](https://github.com/tiangolo/python-machine-learning-docker/blob/master/cuda9.1-python3.7/Dockerfile)
+* [`cuda9.1-python3.6` _(Dockerfile)_](https://github.com/tiangolo/python-machine-learning-docker/blob/master/cuda9.1-python3.6/Dockerfile)
+* [`python3.6-tensorflow` _(Dockerfile)_](https://github.com/tiangolo/python-machine-learning-docker/blob/master/python3.6-tensorflow/Dockerfile)
+* [`cuda9.1-python3.6-tensorflow` _(Dockerfile)_](https://github.com/tiangolo/python-machine-learning-docker/blob/master/cuda9.1-python3.6-tensorflow/Dockerfile)
 
 
 # python-machine-learning
@@ -78,15 +78,15 @@ There are also versions with TensorFlow and CUDA. So, you can run TensorFlow (bu
 * You don't need to clone the GitHub repo. You can use this image as a base image for other images, using this in your `Dockerfile`:
 
 ```Dockerfile
-FROM tiangolo/python-machine-learning:conda-python3.7
+FROM tiangolo/python-machine-learning:python3.7
 
 COPY ./main.py /app/main.py
 ```
 
 or any of the image variants, e.g.:
 
 ```Dockerfile
-FROM tiangolo/python-machine-learning:conda-cuda9.1-python3.6-tensorflow
+FROM tiangolo/python-machine-learning:cuda9.1-python3.6-tensorflow
 
 COPY ./main.py /app/main.py
 ```
@@ -98,7 +98,7 @@ You can override that behavior and run your own program creating a file at `/sta
 For example:
 
 ```Dockerfile
-FROM tiangolo/python-machine-learning:conda-python3.7
+FROM tiangolo/python-machine-learning:python3.7
 
 COPY ./start.sh /start.sh
 RUN chmod +x /start.sh

docker-compose.build.stage01.yml

@@ -1,17 +1,17 @@
 version: '3'
 services:
   latest:
-    build: ./conda-python3.7
+    build: ./python3.7
     image: tiangolo/python-machine-learning:latest
-  conda-python3.7:
-    build: ./conda-python3.7
-    image: tiangolo/python-machine-learning:conda-python3.7
-  conda-python3.6:
-    build: ./conda-python3.6
-    image: tiangolo/python-machine-learning:conda-python3.6
-  conda-cuda9.1-python3.7:
-    build: ./conda-cuda9.1-python3.7
-    image: tiangolo/python-machine-learning:conda-cuda9.1-python3.7
-  conda-cuda9.1-python3.6:
-    build: ./conda-cuda9.1-python3.6
-    image: tiangolo/python-machine-learning:conda-cuda9.1-python3.6
+  python3.7:
+    build: ./python3.7
+    image: tiangolo/python-machine-learning:python3.7
+  python3.6:
+    build: ./python3.6
+    image: tiangolo/python-machine-learning:python3.6
+  cuda9.1-python3.7:
+    build: ./cuda9.1-python3.7
+    image: tiangolo/python-machine-learning:cuda9.1-python3.7
+  cuda9.1-python3.6:
+    build: ./cuda9.1-python3.6
+    image: tiangolo/python-machine-learning:cuda9.1-python3.6

docker-compose.build.stage02.yml

@@ -1,8 +1,8 @@
 version: '3'
 services:
-  conda-python3.6-tensorflow:
-    build: ./conda-python3.6-tensorflow
-    image: tiangolo/python-machine-learning:conda-python3.6-tensorflow
-  conda-cuda9.1-python3.6-tensorflow:
-    build: ./conda-cuda9.1-python3.6-tensorflow
-    image: tiangolo/python-machine-learning:conda-cuda9.1-python3.6-tensorflow
+  python3.6-tensorflow:
+    build: ./python3.6-tensorflow
+    image: tiangolo/python-machine-learning:python3.6-tensorflow
+  cuda9.1-python3.6-tensorflow:
+    build: ./cuda9.1-python3.6-tensorflow
+    image: tiangolo/python-machine-learning:cuda9.1-python3.6-tensorflow

tests/test_cpu/test_conda.py

@@ -14,8 +14,8 @@ def verify_container(logs, python_version):
 @pytest.mark.parametrize(
     "image,python_version",
     [
-        ("tiangolo/python-machine-learning:conda-python3.6", "3.6"),
-        ("tiangolo/python-machine-learning:conda-python3.7", "3.7"),
+        ("tiangolo/python-machine-learning:python3.6", "3.6"),
+        ("tiangolo/python-machine-learning:python3.7", "3.7"),
     ],
 )
 def test_defaults(image, python_version):

tests/test_cpu/test_conda_tensorflow.py

@@ -15,7 +15,7 @@ def verify_container(logs, python_version):
 
 @pytest.mark.parametrize(
     "image,python_version",
-    [("tiangolo/python-machine-learning:conda-python3.6-tensorflow", "3.6")],
+    [("tiangolo/python-machine-learning:python3.6-tensorflow", "3.6")],
 )
 def test_defaults(image, python_version):
     remove_previous_container(client)

tests/test_cuda/test_conda_cuda.py

@@ -16,8 +16,8 @@ def verify_container(logs, python_version):
 @pytest.mark.parametrize(
     "image,python_version",
     [
-        ("tiangolo/python-machine-learning:conda-cuda9.1-python3.6", "3.6"),
-        ("tiangolo/python-machine-learning:conda-cuda9.1-python3.7", "3.7"),
+        ("tiangolo/python-machine-learning:cuda9.1-python3.6", "3.6"),
+        ("tiangolo/python-machine-learning:cuda9.1-python3.7", "3.7"),
     ],
 )
 def test_defaults(image, python_version):

tests/test_cuda/test_conda_cuda_tensorflow.py

@@ -19,7 +19,7 @@ def verify_container(logs, python_version):
 
 @pytest.mark.parametrize(
     "image,python_version",
-    [("tiangolo/python-machine-learning:conda-cuda9.1-python3.6-tensorflow", "3.6")],
+    [("tiangolo/python-machine-learning:cuda9.1-python3.6-tensorflow", "3.6")],
 )
 def test_defaults(image, python_version):
     remove_previous_container(client)