Skip to content

Commit 12db680

Browse files
saikiran2603alexellis
authored andcommitted
fix: tox config file as in sub directory correcting WORKDIR
Signed-off-by: saikiran <neo2603@gmail.com>
1 parent cdb82b4 commit 12db680

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

template/python3-flask-armhf/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,9 @@ WORKDIR /home/app/function/
3030
COPY function/requirements.txt .
3131
RUN pip install --user -r requirements.txt
3232

33-
WORKDIR /home/app/
34-
3533
USER root
36-
COPY function function
37-
RUN chown -R app:app ./
34+
COPY function/ .
35+
RUN chown -R app:app ../
3836

3937
ARG TEST_COMMAND=tox
4038
ARG TEST_ENABLED=true
@@ -44,6 +42,8 @@ RUN if [ "$TEST_ENABLED" == "false" ]; then \
4442
eval "$TEST_COMMAND"; \
4543
fi
4644

45+
WORKDIR /home/app/
46+
4747
USER app
4848

4949
ENV fprocess="python index.py"

template/python3-flask-debian/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,11 @@ WORKDIR /home/app/function/
3434
COPY function/requirements.txt .
3535
RUN pip install --user -r requirements.txt
3636

37-
WORKDIR /home/app/
38-
3937
#install function code
4038
USER root
4139

42-
COPY function function
43-
RUN chown -R app:app ./
40+
COPY function/ .
41+
RUN chown -R app:app ../
4442

4543
ARG TEST_COMMAND=tox
4644
ARG TEST_ENABLED=true
@@ -50,6 +48,8 @@ RUN if [ "$TEST_ENABLED" == "false" ]; then \
5048
eval "$TEST_COMMAND"; \
5149
fi
5250

51+
WORKDIR /home/app/
52+
5353
#configure WSGI server and healthcheck
5454
USER app
5555

template/python3-http-armhf/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,9 @@ WORKDIR /home/app/function/
2828
COPY function/requirements.txt .
2929
RUN pip install --user -r requirements.txt
3030

31-
WORKDIR /home/app/
32-
3331
USER root
34-
COPY function function
35-
RUN chown -R app:app ./
32+
COPY function/ .
33+
RUN chown -R app:app ../
3634

3735
ARG TEST_COMMAND=tox
3836
ARG TEST_ENABLED=true
@@ -42,6 +40,8 @@ RUN if [ "$TEST_ENABLED" == "false" ]; then \
4240
eval "$TEST_COMMAND"; \
4341
fi
4442

43+
WORKDIR /home/app/
44+
4545
USER app
4646

4747
# Set up of-watchdog for HTTP mode

template/python3-http-debian/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,9 @@ WORKDIR /home/app/function/
3131
COPY function/requirements.txt .
3232
RUN pip install --user -r requirements.txt
3333

34-
WORKDIR /home/app/
35-
3634
USER root
37-
COPY function function
38-
RUN chown -R app:app ./
35+
COPY function/ .
36+
RUN chown -R app:app ../
3937

4038
ARG TEST_COMMAND=tox
4139
ARG TEST_ENABLED=true
@@ -45,6 +43,8 @@ RUN if [ "$TEST_ENABLED" == "false" ]; then \
4543
eval "$TEST_COMMAND"; \
4644
fi
4745

46+
WORKDIR /home/app/
47+
4848
USER app
4949

5050
# Set up of-watchdog for HTTP mode

template/python3-http/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,10 @@ WORKDIR /home/app/function/
3333
COPY function/requirements.txt .
3434
RUN pip install --user -r requirements.txt
3535

36-
WORKDIR /home/app/
37-
3836
#install function code
3937
USER root
40-
COPY function function
41-
RUN chown -R app:app ./
38+
COPY function/ .
39+
RUN chown -R app:app ../
4240

4341
ARG TEST_COMMAND=tox
4442
ARG TEST_ENABLED=true
@@ -48,6 +46,8 @@ RUN if [ "$TEST_ENABLED" == "false" ]; then \
4846
eval "$TEST_COMMAND"; \
4947
fi
5048

49+
WORKDIR /home/app/
50+
5151
#configure WSGI server and healthcheck
5252
USER app
5353

0 commit comments

Comments
 (0)