Merge pull request #58 from isabelizimm/expose-docker

EXPOSE port in Dockerfile

Author: isabelizimm

vetiver/tests/test_write_docker.py

@@ -14,23 +14,26 @@ def test_vetiver_write_app_no_rspm():
     contents = open(file).read()
     os.remove(file)
     assert(contents == f"""# # Generated by the vetiver package; edit with care
-#
+# start with python base image
 FROM python:{py_version}
 
-#
-WORKDIR /code
+# create directory in container for vetiver files
+WORKDIR /vetiver
 
-#
-COPY vetiver_requirements.txt /code/requirements.txt
+# copy  and install requirements
+COPY vetiver_requirements.txt /vetiver/requirements.txt
 
 #
-RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
+RUN pip install --no-cache-dir --upgrade -r /vetiver/requirements.txt
 
-#
-COPY app.py /code/app
+# copy app file
+COPY app.py /vetiver/app
 
-#
-CMD ["uvicorn", "app.app:api", "--host", "0.0.0.0", "--port", "80"]
+# expose port
+EXPOSE 8080
+
+# run vetiver API
+CMD ["uvicorn", "app.app:api", "--host", "0.0.0.0", "--port", "8080"]
 """)
 
 def test_vetiver_write_app_rspm():
@@ -41,22 +44,25 @@ def test_vetiver_write_app_rspm():
     py_version = str(sys.version_info.major) + "." + str(sys.version_info.minor)
 
     assert(contents == f"""# # Generated by the vetiver package; edit with care
-#
+# start with python base image
 FROM python:{py_version}
 
-#
-WORKDIR /code
+# create directory in container for vetiver files
+WORKDIR /vetiver
 
-#
-COPY vetiver_requirements.txt /code/requirements.txt
+# copy  and install requirements
+COPY vetiver_requirements.txt /vetiver/requirements.txt
 
 #
 RUN pip config set global.index-url https://colorado.rstudio.com/rspm/pypi/latest/simple
-RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
+RUN pip install --no-cache-dir --upgrade -r /vetiver/requirements.txt
 
-#
-COPY app.py /code/app
+# copy app file
+COPY app.py /vetiver/app
 
-#
-CMD ["uvicorn", "app.app:api", "--host", "0.0.0.0", "--port", "80"]
+# expose port
+EXPOSE 8080
+
+# run vetiver API
+CMD ["uvicorn", "app.app:api", "--host", "0.0.0.0", "--port", "8080"]
 """)

vetiver/write_docker.py

@@ -1,10 +1,10 @@
 import sys
 
 def vetiver_write_docker(app_file: str = "app.py",
-    path: str = ".",
+    path: str = "./",
     rspm_env: bool = False,
     host: str = "0.0.0.0",
-    port: str = "80"):
+    port: str = "8080"):
     """Writes a Dockerfile to run VetiverAPI in a container
 
     Args
@@ -29,22 +29,25 @@ def vetiver_write_docker(app_file: str = "app.py",
 
 
     docker_script = f"""# # Generated by the vetiver package; edit with care
-#
+# start with python base image
 FROM python:{py_version}
 
-#
-WORKDIR /code
+# create directory in container for vetiver files
+WORKDIR /vetiver
 
-#
-COPY vetiver_requirements.txt /code/requirements.txt
+# copy  and install requirements
+COPY vetiver_requirements.txt /vetiver/requirements.txt
 
 #{rspm}
-RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
+RUN pip install --no-cache-dir --upgrade -r /vetiver/requirements.txt
 
-#
-COPY {app_file} /code/app
+# copy app file
+COPY {app_file} /vetiver/app
 
-#
+# expose port
+EXPOSE {port}
+
+# run vetiver API
 CMD ["uvicorn", "app.app:api", "--host", "{host}", "--port", "{port}"]
 """