Skip to content

Commit 152f0bc

Browse files
rgschmitz1alexellis
authored andcommitted
fix: make TEST_ENABLED conditional posix friendly
Signed-off-by: Bob Schmitz III <schmitzr1984@gmail.com>
1 parent 12db680 commit 152f0bc

File tree

6 files changed

+7
-31
lines changed

6 files changed

+7
-31
lines changed

template/python3-flask-armhf/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,7 @@ RUN chown -R app:app ../
3636

3737
ARG TEST_COMMAND=tox
3838
ARG TEST_ENABLED=true
39-
RUN if [ "$TEST_ENABLED" == "false" ]; then \
40-
echo "skipping tests";\
41-
else \
42-
eval "$TEST_COMMAND"; \
43-
fi
39+
RUN [ "$TEST_ENABLED" = "false" ] && echo "skipping tests" || eval "$TEST_COMMAND"
4440

4541
WORKDIR /home/app/
4642

template/python3-flask-debian/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@ RUN chown -R app:app ../
4242

4343
ARG TEST_COMMAND=tox
4444
ARG TEST_ENABLED=true
45-
RUN if [ "$TEST_ENABLED" == "false" ]; then \
46-
echo "skipping tests";\
47-
else \
48-
eval "$TEST_COMMAND"; \
49-
fi
45+
RUN [ "$TEST_ENABLED" = "false" ] && echo "skipping tests" || eval "$TEST_COMMAND"
5046

5147
WORKDIR /home/app/
5248

template/python3-flask/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@ RUN chown -R app:app ../
4242

4343
ARG TEST_COMMAND=tox
4444
ARG TEST_ENABLED=true
45-
RUN if [ "$TEST_ENABLED" == "false" ]; then \
46-
echo "skipping tests";\
47-
else \
48-
eval "$TEST_COMMAND"; \
49-
fi
45+
RUN [ "$TEST_ENABLED" = "false" ] && echo "skipping tests" || eval "$TEST_COMMAND"
5046

5147
WORKDIR /home/app/
5248

template/python3-http-armhf/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@ RUN chown -R app:app ../
3434

3535
ARG TEST_COMMAND=tox
3636
ARG TEST_ENABLED=true
37-
RUN if [ "$TEST_ENABLED" == "false" ]; then \
38-
echo "skipping tests";\
39-
else \
40-
eval "$TEST_COMMAND"; \
41-
fi
37+
RUN [ "$TEST_ENABLED" = "false" ] && echo "skipping tests" || eval "$TEST_COMMAND"
4238

4339
WORKDIR /home/app/
4440

template/python3-http-debian/Dockerfile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@ RUN chown -R app:app ../
3737

3838
ARG TEST_COMMAND=tox
3939
ARG TEST_ENABLED=true
40-
RUN if [ "$TEST_ENABLED" == "false" ]; then \
41-
echo "skipping tests";\
42-
else \
43-
eval "$TEST_COMMAND"; \
44-
fi
40+
RUN [ "$TEST_ENABLED" = "false" ] && echo "skipping tests" || eval "$TEST_COMMAND"
4541

4642
WORKDIR /home/app/
4743

@@ -55,4 +51,4 @@ ENV upstream_url="http://127.0.0.1:5000"
5551

5652
HEALTHCHECK --interval=5s CMD [ -e /tmp/.lock ] || exit 1
5753

58-
CMD ["fwatchdog"]
54+
CMD ["fwatchdog"]

template/python3-http/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,7 @@ RUN chown -R app:app ../
4040

4141
ARG TEST_COMMAND=tox
4242
ARG TEST_ENABLED=true
43-
RUN if [ "$TEST_ENABLED" == "false" ]; then \
44-
echo "skipping tests";\
45-
else \
46-
eval "$TEST_COMMAND"; \
47-
fi
43+
RUN [ "$TEST_ENABLED" = "false" ] && echo "skipping tests" || eval "$TEST_COMMAND"
4844

4945
WORKDIR /home/app/
5046

0 commit comments

Comments
 (0)