Skip to content

Commit 8359162

Browse files
authored
Merge pull request #59 from behance/bryanlatten-patch-1
Dockerfile-centos: fix non-continuation lines
2 parents 39a37ed + d833d3c commit 8359162

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

Dockerfile-centos

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@ RUN /bin/bash -e /security_updates.sh && \
2020
# Overlay the root filesystem from this repo
2121
COPY ./container/root /
2222

23-
# Set nginx to listen on defined port
24-
# NOTE: order of operations is important, new config had to already installed from repo (above)
23+
# - Set nginx to listen on defined port
24+
# - NOTE: order of operations is important, new config had to already installed from repo (above)
25+
# - Make temp directory for .nginx runtime files
26+
# - Update nginx.conf user
27+
# - Some operations can be completely removed once this ticket is resolved:
28+
# - https://trac.nginx.org/nginx/ticket/1243
29+
# - Remove older WOFF mime-type
30+
# - Add again with newer mime-type
31+
# - Also add mime-type for WOFF2
2532
RUN sed -i "s/listen [0-9]*;/listen ${CONTAINER_PORT};/" $CONF_NGINX_SITE && \
26-
# Make temp directory for .nginx runtime files \
2733
mkdir /tmp/.nginx && \
28-
# Update nginx.conf user
2934
sed -i "s/^user .*$/user ${NOT_ROOT_USER};/" ${CONF_NGINX_SERVER} && \
30-
# Next three operations can be completely removed once this ticket is resolved:
31-
# https://trac.nginx.org/nginx/ticket/1243
32-
# Remove older WOFF mime-type
3335
sed -i "/application\/font-woff/d" /etc/nginx/mime.types && \
34-
# Add again with newer mime-type
3536
sed -i "s/}/\n font\/woff woff;&/" /etc/nginx/mime.types && \
36-
# Also add mime-type for WOFF2
3737
sed -i "s/}/\n font\/woff2 woff2;\n&/g" /etc/nginx/mime.types
3838

3939
RUN goss -g /tests/centos/nginx.goss.yaml validate && \

0 commit comments

Comments
 (0)