Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,42 @@ Makefile
src/Makefile
install_manifest.txt
src/rhtml.yy.cpp
doc/xml/doc.mod
doc/xml/include/latex/modruby_apache_req_imp.rb
doc/xml/include/latex/modruby_apr_table_collision_ex.rb
doc/xml/include/latex/modruby_apr_table_ex.rb
doc/xml/include/latex/modruby_apr_table_ex2.rb
doc/xml/include/latex/modruby_apr_table_ex3.rb
doc/xml/include/latex/modruby_bypass_buffer.rhtml
doc/xml/include/latex/modruby_cgi_cookies_ex.rb
doc/xml/include/latex/modruby_cgi_env_ex.rb
doc/xml/include/latex/modruby_cgi_queries_ex.rb
doc/xml/include/latex/modruby_clear_buffer.rhtml
doc/xml/include/latex/modruby_handler_module.rb
doc/xml/include/latex/modruby_handler_module_override.rb
doc/xml/include/latex/modruby_module_config_get.rb
doc/xml/include/latex/modruby_redirect1_ex.rb
doc/xml/include/latex/modruby_redirect_ex.rb
doc/xml/include/latex/modruby_rfc2388_example.rb
doc/xml/include/latex/modruby_send_file.rhtml
doc/xml/include/latex/modruby_terminate1_ex.rb
doc/xml/include/latex/modruby_terminate2_ex.rb
doc/xml/include/modruby_apache_req_imp.rb.html
doc/xml/include/modruby_apr_table_collision_ex.rb.html
doc/xml/include/modruby_apr_table_ex.rb.html
doc/xml/include/modruby_apr_table_ex2.rb.html
doc/xml/include/modruby_apr_table_ex3.rb.html
doc/xml/include/modruby_bypass_buffer.rhtml.html
doc/xml/include/modruby_cgi_cookies_ex.rb.html
doc/xml/include/modruby_cgi_env_ex.rb.html
doc/xml/include/modruby_cgi_queries_ex.rb.html
doc/xml/include/modruby_clear_buffer.rhtml.html
doc/xml/include/modruby_handler_module.rb.html
doc/xml/include/modruby_handler_module_override.rb.html
doc/xml/include/modruby_module_config_get.rb.html
doc/xml/include/modruby_redirect1_ex.rb.html
doc/xml/include/modruby_redirect_ex.rb.html
doc/xml/include/modruby_rfc2388_example.rb.html
doc/xml/include/modruby_send_file.rhtml.html
doc/xml/include/modruby_terminate1_ex.rb.html
doc/xml/include/modruby_terminate2_ex.rb.html
77 changes: 42 additions & 35 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,37 +1,39 @@
FROM centos:centos7

RUN yum install -y epel-release && yum -y upgrade && yum install -y \
apr-devel \
apr-util \
apr-util-devel \
autoconf \
automake \
bison \
bzip2 \
cmake3 \
curl \
cyrus-sasl \
cyrus-sasl-devel \
flex \
flex-devel \
gcc \
gcc-c++ \
gdb \
git \
gpg \
httpd \
httpd-devel \
libffi-devel \
libtool \
libyaml \
openssl-devel \
patch \
readline-devel \
sqlite-devel \
make \
redhat-lsb \
unzip \
zlib-devel
FROM oraclelinux:8

RUN dnf install -y oraclelinux-release-el8 oracle-epel-release-el8 \
&& dnf --enablerepo=ol8_codeready_builder install -y \
apr-devel \
apr-util \
apr-util-devel \
autoconf \
automake \
bison \
bzip2 \
cmake3 \
curl \
cyrus-sasl \
cyrus-sasl-devel \
flex \
gcc \
gcc-c++ \
gdb \
git \
gpg \
httpd \
httpd-devel \
libffi-devel \
libtool \
libyaml \
libyaml-devel \
openssl-devel \
patch \
readline-devel \
ruby \
sqlite-devel \
make \
redhat-lsb \
unzip \
zlib-devel

# Import GPG key for RVM
RUN gpg \
Expand All @@ -52,7 +54,12 @@ SHELL ["/bin/bash", "-l", "-c"]
RUN rvm requirements

# Pick your ruby version here
RUN rvm install ruby-2.3.3
# Segfaults in rb_protect()
#RUN rvm install ruby-3.2.3
# Works
RUN rvm install ruby-2.7.5
# Same segfault as 3.2.3
#RUN rvm install ruby-3.0.3

# Setup our libruby.so dir in ld.so.conf
RUN rvm config-get libdir > /etc/ld.so.conf.d/ruby.conf && ldconfig
Expand Down
1 change: 1 addition & 0 deletions config/linux/OracleServer
3 changes: 2 additions & 1 deletion script/docker_run
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/bash
root=$( readlink -f $( dirname $( readlink -f $0 ) )/.. )
docker build -t mod_ruby $root

docker rm -f mod_ruby_run_container
# Change 8080 here if you have a local conflict with it
Expand All @@ -10,7 +11,7 @@ docker run \
-v $root:/usr/src/mod_ruby \
-ti \
-p 8080:80 \
mod_ruby /bin/bash -l -c 'cmake3 . && make install && /httpd-gdb'
mod_ruby
#If you run httpd in FOREGROUND and run the container
#with -d instead of -ti
#docker logs -f mod_ruby_run_container