Skip to content

Commit 9f56f45

Browse files
committed
1 parent b0a643a commit 9f56f45

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

.hadolint.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
ignored:
22
- DL3018 # Pin versions in apk add - See: https://github.com/hadolint/hadolint/wiki/DL3018
33
- SC2086 # For now I had troubles to do a proper quoting for PHPIZE_DEPS - See: https://github.com/koalaman/shellcheck/wiki/SC2086
4+
- DL3017 # For upgrading CVEs we need to use upgrade

Dockerfile-cli

+3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ RUN set -x \
2020
&& docker-php-source-tarball clean && rm /usr/local/bin/php-cgi && rm /usr/local/bin/phpdbg && rm -rf /tmp/pear ~/.pearrc \
2121
&& apk del .phpize-deps
2222

23+
# Patch CVE-2018-14618
24+
RUN apk upgrade --no-cache curl
25+
2326
COPY src/php/conf/default.ini /usr/local/etc/php/conf.d/
2427
COPY src/php/cli/conf/*.ini /usr/local/etc/php/conf.d/
2528

Dockerfile-fpm

+3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ RUN apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS \
2121
&& apk del .phpize-deps \
2222
&& apk add --no-cache fcgi
2323

24+
# Patch CVE-2018-14618
25+
RUN apk upgrade --no-cache curl
26+
2427
COPY src/php/conf/default.ini /usr/local/etc/php/conf.d/
2528
COPY src/php/fpm/conf/*.conf /usr/local/etc/php-fpm.d/
2629

0 commit comments

Comments
 (0)