Skip to content

Commit

Permalink
Merge pull request #909 from infosiftr/SIGWINCH
Browse files Browse the repository at this point in the history
Swap "WINCH" for "SIGWINCH" (which fixes containerd's ability to use this value)
  • Loading branch information
tianon authored Nov 28, 2019
2 parents 4aa1f0e + 49d8614 commit 2bf33a8
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion 7.1/buster/apache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bi
ENTRYPOINT ["docker-php-entrypoint"]
##<autogenerated>##
# https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop
STOPSIGNAL WINCH
STOPSIGNAL SIGWINCH

COPY apache2-foreground /usr/local/bin/
WORKDIR /var/www/html
Expand Down
2 changes: 1 addition & 1 deletion 7.1/stretch/apache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
ENTRYPOINT ["docker-php-entrypoint"]
##<autogenerated>##
# https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop
STOPSIGNAL WINCH
STOPSIGNAL SIGWINCH

COPY apache2-foreground /usr/local/bin/
WORKDIR /var/www/html
Expand Down
2 changes: 1 addition & 1 deletion 7.2/buster/apache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bi
ENTRYPOINT ["docker-php-entrypoint"]
##<autogenerated>##
# https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop
STOPSIGNAL WINCH
STOPSIGNAL SIGWINCH

COPY apache2-foreground /usr/local/bin/
WORKDIR /var/www/html
Expand Down
2 changes: 1 addition & 1 deletion 7.2/stretch/apache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ RUN docker-php-ext-enable sodium
ENTRYPOINT ["docker-php-entrypoint"]
##<autogenerated>##
# https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop
STOPSIGNAL WINCH
STOPSIGNAL SIGWINCH

COPY apache2-foreground /usr/local/bin/
WORKDIR /var/www/html
Expand Down
2 changes: 1 addition & 1 deletion 7.3/buster/apache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bi
ENTRYPOINT ["docker-php-entrypoint"]
##<autogenerated>##
# https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop
STOPSIGNAL WINCH
STOPSIGNAL SIGWINCH

COPY apache2-foreground /usr/local/bin/
WORKDIR /var/www/html
Expand Down
2 changes: 1 addition & 1 deletion 7.3/stretch/apache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ RUN docker-php-ext-enable sodium
ENTRYPOINT ["docker-php-entrypoint"]
##<autogenerated>##
# https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop
STOPSIGNAL WINCH
STOPSIGNAL SIGWINCH

COPY apache2-foreground /usr/local/bin/
WORKDIR /var/www/html
Expand Down
2 changes: 1 addition & 1 deletion 7.4/buster/apache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ RUN docker-php-ext-enable sodium
ENTRYPOINT ["docker-php-entrypoint"]
##<autogenerated>##
# https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop
STOPSIGNAL WINCH
STOPSIGNAL SIGWINCH

COPY apache2-foreground /usr/local/bin/
WORKDIR /var/www/html
Expand Down
2 changes: 1 addition & 1 deletion apache-Dockerfile-block-2
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop
STOPSIGNAL WINCH
STOPSIGNAL SIGWINCH

COPY apache2-foreground /usr/local/bin/
WORKDIR /var/www/html
Expand Down

0 comments on commit 2bf33a8

Please sign in to comment.