fix: tox config file as in sub directory correcting WORKDIR

Signed-off-by: saikiran <neo2603@gmail.com>
openfaas · Apr 6, 2021 · 12db680 · 12db680
1 parent cdb82b4
commit 12db680
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/template/python3-flask-armhf/Dockerfile b/template/python3-flask-armhf/Dockerfile
@@ -30,11 +30,9 @@ WORKDIR /home/app/function/
 COPY function/requirements.txt	.
 RUN pip install --user -r requirements.txt
 
-WORKDIR /home/app/
-
 USER root
-COPY function   function
-RUN chown -R app:app ./
+COPY function/   .
+RUN chown -R app:app ../
 
 ARG TEST_COMMAND=tox
 ARG TEST_ENABLED=true
@@ -44,6 +42,8 @@ RUN if [ "$TEST_ENABLED" == "false" ]; then \
     eval "$TEST_COMMAND"; \
     fi
 
+WORKDIR /home/app/
+
 USER app
 
 ENV fprocess="python index.py"

diff --git a/template/python3-flask-debian/Dockerfile b/template/python3-flask-debian/Dockerfile
@@ -34,13 +34,11 @@ WORKDIR /home/app/function/
 COPY function/requirements.txt	.
 RUN pip install --user -r requirements.txt
 
-WORKDIR /home/app/
-
 #install function code
 USER root
 
-COPY function   function
-RUN chown -R app:app ./
+COPY function/   .
+RUN chown -R app:app ../
 
 ARG TEST_COMMAND=tox
 ARG TEST_ENABLED=true
@@ -50,6 +48,8 @@ RUN if [ "$TEST_ENABLED" == "false" ]; then \
     eval "$TEST_COMMAND"; \
     fi
 
+WORKDIR /home/app/
+
 #configure WSGI server and healthcheck
 USER app
 

diff --git a/template/python3-http-armhf/Dockerfile b/template/python3-http-armhf/Dockerfile
@@ -28,11 +28,9 @@ WORKDIR /home/app/function/
 COPY function/requirements.txt	.
 RUN pip install --user -r requirements.txt
 
-WORKDIR /home/app/
-
 USER root
-COPY function   function
-RUN chown -R app:app ./
+COPY function/   .
+RUN chown -R app:app ../
 
 ARG TEST_COMMAND=tox
 ARG TEST_ENABLED=true
@@ -42,6 +40,8 @@ RUN if [ "$TEST_ENABLED" == "false" ]; then \
     eval "$TEST_COMMAND"; \
     fi
 
+WORKDIR /home/app/
+
 USER app
 
 # Set up of-watchdog for HTTP mode

diff --git a/template/python3-http-debian/Dockerfile b/template/python3-http-debian/Dockerfile
@@ -31,11 +31,9 @@ WORKDIR /home/app/function/
 COPY function/requirements.txt	.
 RUN pip install --user -r requirements.txt
 
-WORKDIR /home/app/
-
 USER root
-COPY function   function
-RUN chown -R app:app ./
+COPY function/   .
+RUN chown -R app:app ../
 
 ARG TEST_COMMAND=tox
 ARG TEST_ENABLED=true
@@ -45,6 +43,8 @@ RUN if [ "$TEST_ENABLED" == "false" ]; then \
     eval "$TEST_COMMAND"; \
     fi
 
+WORKDIR /home/app/
+
 USER app
 
 # Set up of-watchdog for HTTP mode

diff --git a/template/python3-http/Dockerfile b/template/python3-http/Dockerfile
@@ -33,12 +33,10 @@ WORKDIR /home/app/function/
 COPY function/requirements.txt	.
 RUN pip install --user -r requirements.txt
 
-WORKDIR /home/app/
-
 #install function code
 USER root
-COPY function   function
-RUN chown -R app:app ./
+COPY function/   .
+RUN chown -R app:app ../
 
 ARG TEST_COMMAND=tox
 ARG TEST_ENABLED=true
@@ -48,6 +46,8 @@ RUN if [ "$TEST_ENABLED" == "false" ]; then \
     eval "$TEST_COMMAND"; \
     fi
 
+WORKDIR /home/app/
+
 #configure WSGI server and healthcheck
 USER app