Skip to content

Commit 0a94644

Browse files
committed
Fix "directory exists" test failures when setting up nginx
Some versions of nginx create directories, so use -p with mkdir.
1 parent a832404 commit 0a94644

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

test/Dockerfile-bash4-0

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ RUN apk --no-cache add supervisor openssl git curl bind-tools drill wget nginx l
77
WORKDIR /root
88

99
# Create nginx directories in standard places
10-
RUN mkdir /run/nginx
11-
RUN mkdir /etc/nginx/pki
12-
RUN mkdir /etc/nginx/pki/private
10+
RUN mkdir -p /run/nginx
11+
RUN mkdir -p /etc/nginx/pki
12+
RUN mkdir -p /etc/nginx/pki/private
1313

1414
# Setup ftp
1515
ENV VSFTPD_CONF=/etc/vsftpd.conf

test/Dockerfile-bash4-2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ RUN apk --no-cache add supervisor openssl git curl bind-tools drill wget nginx l
77
WORKDIR /root
88

99
# Create nginx directories in standard places
10-
RUN mkdir /run/nginx
11-
RUN mkdir /etc/nginx/pki
12-
RUN mkdir /etc/nginx/pki/private
10+
RUN mkdir -p /run/nginx
11+
RUN mkdir -p /etc/nginx/pki
12+
RUN mkdir -p /etc/nginx/pki/private
1313

1414
# Setup ftp
1515
ENV VSFTPD_CONF=/etc/vsftpd.conf

test/Dockerfile-bash5-0

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ RUN apk --no-cache add supervisor openssl git curl bind-tools drill wget nginx l
77
WORKDIR /root
88

99
# Create nginx directories in standard places
10-
RUN mkdir /run/nginx
11-
RUN mkdir /etc/nginx/pki
12-
RUN mkdir /etc/nginx/pki/private
10+
RUN mkdir -p /run/nginx
11+
RUN mkdir -p /etc/nginx/pki
12+
RUN mkdir -p /etc/nginx/pki/private
1313

1414
# Setup ftp
1515
ENV VSFTPD_CONF=/etc/vsftpd.conf

test/Dockerfile-centos7-dynu

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ ENV dynamic_dns "duckdns"
1717
#ENV DYNU_API_KEY
1818

1919
WORKDIR /root
20-
RUN mkdir /etc/nginx/pki
21-
RUN mkdir /etc/nginx/pki/private
20+
RUN mkdir -p /etc/nginx/pki
21+
RUN mkdir -p /etc/nginx/pki/private
2222
COPY ./test/test-config/nginx-ubuntu-no-ssl /etc/nginx/conf.d/default.conf
2323
COPY ./test/test-config/nginx-centos7.conf /etc/nginx/nginx.conf
2424

0 commit comments

Comments
 (0)