Skip to content

Commit 99b6d94

Browse files
tianontianon
authored
Merge pull request #237 from infosiftr/thread-stack-fix
Apply Alpine thread stack size patch
2 parents bba73b8 + 87ab073 commit 99b6d94

File tree

8 files changed

+64
-0
lines changed

8 files changed

+64
-0
lines changed

‎2.3/alpine3.7/Dockerfile

+8
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@ RUN set -ex \
5555
\
5656
&& cd /usr/src/ruby \
5757
\
58+
# https://github.com/docker-library/ruby/issues/196
59+
# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source)
60+
# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here)
61+
&& wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \
62+
&& echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \
63+
&& patch -p1 -i thread-stack-fix.patch \
64+
&& rm thread-stack-fix.patch \
65+
\
5866
# hack in "ENABLE_PATH_CHECK" disabling to suppress:
5967
# warning: Insecure world writable dir
6068
&& { \

‎2.3/alpine3.8/Dockerfile

+8
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@ RUN set -ex \
5555
\
5656
&& cd /usr/src/ruby \
5757
\
58+
# https://github.com/docker-library/ruby/issues/196
59+
# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source)
60+
# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here)
61+
&& wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \
62+
&& echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \
63+
&& patch -p1 -i thread-stack-fix.patch \
64+
&& rm thread-stack-fix.patch \
65+
\
5866
# hack in "ENABLE_PATH_CHECK" disabling to suppress:
5967
# warning: Insecure world writable dir
6068
&& { \

‎2.4/alpine3.6/Dockerfile

+8
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@ RUN set -ex \
5555
\
5656
&& cd /usr/src/ruby \
5757
\
58+
# https://github.com/docker-library/ruby/issues/196
59+
# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source)
60+
# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here)
61+
&& wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \
62+
&& echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \
63+
&& patch -p1 -i thread-stack-fix.patch \
64+
&& rm thread-stack-fix.patch \
65+
\
5866
# hack in "ENABLE_PATH_CHECK" disabling to suppress:
5967
# warning: Insecure world writable dir
6068
&& { \

‎2.4/alpine3.7/Dockerfile

+8
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@ RUN set -ex \
5555
\
5656
&& cd /usr/src/ruby \
5757
\
58+
# https://github.com/docker-library/ruby/issues/196
59+
# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source)
60+
# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here)
61+
&& wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \
62+
&& echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \
63+
&& patch -p1 -i thread-stack-fix.patch \
64+
&& rm thread-stack-fix.patch \
65+
\
5866
# hack in "ENABLE_PATH_CHECK" disabling to suppress:
5967
# warning: Insecure world writable dir
6068
&& { \

‎2.5/alpine3.7/Dockerfile

+8
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@ RUN set -ex \
5555
\
5656
&& cd /usr/src/ruby \
5757
\
58+
# https://github.com/docker-library/ruby/issues/196
59+
# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source)
60+
# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here)
61+
&& wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \
62+
&& echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \
63+
&& patch -p1 -i thread-stack-fix.patch \
64+
&& rm thread-stack-fix.patch \
65+
\
5866
# hack in "ENABLE_PATH_CHECK" disabling to suppress:
5967
# warning: Insecure world writable dir
6068
&& { \

‎2.6-rc/alpine3.7/Dockerfile

+8
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@ RUN set -ex \
5555
\
5656
&& cd /usr/src/ruby \
5757
\
58+
# https://github.com/docker-library/ruby/issues/196
59+
# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source)
60+
# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here)
61+
&& wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \
62+
&& echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \
63+
&& patch -p1 -i thread-stack-fix.patch \
64+
&& rm thread-stack-fix.patch \
65+
\
5866
# hack in "ENABLE_PATH_CHECK" disabling to suppress:
5967
# warning: Insecure world writable dir
6068
&& { \

‎2.6-rc/alpine3.8/Dockerfile

+8
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@ RUN set -ex \
5555
\
5656
&& cd /usr/src/ruby \
5757
\
58+
# https://github.com/docker-library/ruby/issues/196
59+
# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source)
60+
# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here)
61+
&& wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \
62+
&& echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \
63+
&& patch -p1 -i thread-stack-fix.patch \
64+
&& rm thread-stack-fix.patch \
65+
\
5866
# hack in "ENABLE_PATH_CHECK" disabling to suppress:
5967
# warning: Insecure world writable dir
6068
&& { \

‎Dockerfile-alpine.template

+8
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@ RUN set -ex \
5555
\
5656
&& cd /usr/src/ruby \
5757
\
58+
# https://github.com/docker-library/ruby/issues/196
59+
# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source)
60+
# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here)
61+
&& wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \
62+
&& echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \
63+
&& patch -p1 -i thread-stack-fix.patch \
64+
&& rm thread-stack-fix.patch \
65+
\
5866
# hack in "ENABLE_PATH_CHECK" disabling to suppress:
5967
# warning: Insecure world writable dir
6068
&& { \

0 commit comments

Comments
 (0)