Skip to content

Commit 9fa36ae

Browse files
authored
Merge pull request #31 from devilbox/release-0.33
Remove vendored startup files
2 parents 19d5f5d + 2325519 commit 9fa36ae

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ RUN set -x \
7070
###
7171
### Create directories
7272
###
73+
# /docker-entrypoint.d/10-ipv6* was added by nginx to do some IPv6 magic (which breaks the image)
7374
RUN set -x \
75+
&& rm -rf /docker-entrypoint.d || true \
7476
&& mkdir -p /etc/httpd-custom.d \
7577
&& mkdir -p /etc/httpd/conf.d \
7678
&& mkdir -p /etc/httpd/vhost.d \

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,5 +267,5 @@ It allows any of the following combinations:
267267
## Version
268268

269269
```
270-
nginx version: nginx/1.17.6
270+
nginx version: nginx/1.19.1
271271
```

0 commit comments

Comments
 (0)