Skip to content

Commit 4d0d234

Browse files
committed
Update base image, ruby version, and gem versions
1 parent 216d49a commit 4d0d234

File tree

2 files changed

+46
-32
lines changed

2 files changed

+46
-32
lines changed

datascience/Dockerfile

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BASE_IMAGE_TAG=65c71a997042
1+
ARG BASE_IMAGE_TAG=e6970b22a504
22
FROM jupyter/datascience-notebook:$BASE_IMAGE_TAG
33

44
LABEL maintainer="Kenta Murata <mrkn@mrkn.jp>"
@@ -53,6 +53,8 @@ RUN apt update && \
5353
apt install -y --no-install-recommends \
5454
libarrow-dev \
5555
libarrow-glib-dev \
56+
libarrow-dataset-dev \
57+
libarrow-flight-dev \
5658
libplasma-dev \
5759
libplasma-glib-dev \
5860
libgandiva-dev \
@@ -64,9 +66,9 @@ RUN apt update && \
6466
\
6567
rm -rf /var/lib/apt/lists/*
6668

67-
# Copy Ruby 3.0.1 from rubylang/ruby
69+
# Copy Ruby 3.0.2 from rubylang/ruby
6870

69-
COPY --from=rubylang/ruby:3.0.1-focal \
71+
COPY --from=rubylang/ruby:3.0.2-focal \
7072
/usr/local/bin/bundle \
7173
/usr/local/bin/bundler \
7274
/usr/local/bin/erb \
@@ -79,29 +81,29 @@ COPY --from=rubylang/ruby:3.0.1-focal \
7981
/usr/local/bin/ruby \
8082
/usr/local/bin/
8183

82-
COPY --from=rubylang/ruby:3.0.1-focal \
84+
COPY --from=rubylang/ruby:3.0.2-focal \
8385
/usr/local/etc/gemrc \
8486
/usr/local/etc/
8587

8688
# NOTE: DO NOT CHANGE the version in the path of include directory
87-
COPY --from=rubylang/ruby:3.0.1-focal \
89+
COPY --from=rubylang/ruby:3.0.2-focal \
8890
/usr/local/include/ruby-3.0.0/ \
8991
/usr/local/include/ruby-3.0.0/
9092

91-
COPY --from=rubylang/ruby:3.0.1-focal \
93+
COPY --from=rubylang/ruby:3.0.2-focal \
9294
/usr/local/lib/libruby.so \
9395
/usr/local/lib/libruby.so.* \
9496
/usr/local/lib/
9597

96-
COPY --from=rubylang/ruby:3.0.1-focal \
98+
COPY --from=rubylang/ruby:3.0.2-focal \
9799
/usr/local/lib/pkgconfig/ \
98100
/usr/local/lib/pkgconfig/
99101

100-
COPY --from=rubylang/ruby:3.0.1-focal \
102+
COPY --from=rubylang/ruby:3.0.2-focal \
101103
/usr/local/lib/ruby/ \
102104
/usr/local/lib/ruby/
103105

104-
COPY --from=rubylang/ruby:3.0.1-focal \
106+
COPY --from=rubylang/ruby:3.0.2-focal \
105107
/usr/local/share/man/man1/erb.1 \
106108
/usr/local/share/man/man1/irb.1 \
107109
/usr/local/share/man/man1/ri.1 \
@@ -116,18 +118,24 @@ RUN echo "gem: --user-install" >> $HOME/.gemrc
116118
ENV PATH $HOME/.local/share/gem/ruby/3.0.0/bin:$PATH
117119

118120
# Install basic gems
119-
RUN gem install pycall -v ">= 1.4.0" && \
121+
RUN \
122+
gem install irb -v ">= 1.3.8.pre.9" && \
123+
gem install iruby -v ">= 0.7.4" && \
124+
gem install pycall -v ">= 1.4.1" && \
125+
gem install numpy -v ">= 0.4.0" && \
120126
gem install matplotlib -v ">= 1.2.0" && \
121-
gem install iruby -v ">= 0.7.0" && \
127+
gem install pandas -v ">= 0.3.8" && \
128+
gem install charty -v ">= 0.2.11" && \
129+
gem install red-datasets -v ">= 0.1.4" && \
130+
gem install unicode_plot -v ">= 0.0.5" && \
131+
\
122132
gem install \
123133
activerecord \
124134
awesome_print \
125-
charty \
126135
daru \
127136
daru-view \
128137
enumerable-statistics \
129138
ffi-rzmq \
130-
irb \
131139
mysql2 \
132140
nmatrix \
133141
nmatrix-lapacke \
@@ -143,14 +151,13 @@ RUN gem install pycall -v ">= 1.4.0" && \
143151
red-arrow-numo-narray \
144152
red-arrow-nmatrix \
145153
red-chainer \
146-
red-datasets \
147154
red-datasets-arrow \
148155
red-datasets-daru \
156+
red-datasets-pandas \
149157
red-gandiva \
150158
red-parquet \
151159
red-plasma \
152160
rumale \
153-
unicode_plot \
154161
sqlite3
155162

156-
RUN iruby register
163+
RUN iruby register --force

minimal/Dockerfile

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BASE_IMAGE_TAG=65c71a997042
1+
ARG BASE_IMAGE_TAG=e6970b22a504
22
FROM jupyter/scipy-notebook:$BASE_IMAGE_TAG
33

44
LABEL maintainer="Kenta Murata <mrkn@mrkn.jp>"
@@ -53,6 +53,8 @@ RUN apt update && \
5353
apt install -y --no-install-recommends \
5454
libarrow-dev \
5555
libarrow-glib-dev \
56+
libarrow-dataset-dev \
57+
libarrow-flight-dev \
5658
libplasma-dev \
5759
libplasma-glib-dev \
5860
libgandiva-dev \
@@ -64,9 +66,9 @@ RUN apt update && \
6466
\
6567
rm -rf /var/lib/apt/lists/*
6668

67-
# Copy Ruby 3.0.1 from rubylang/ruby
69+
# Copy Ruby 3.0.2 from rubylang/ruby
6870

69-
COPY --from=rubylang/ruby:3.0.1-focal \
71+
COPY --from=rubylang/ruby:3.0.2-focal \
7072
/usr/local/bin/bundle \
7173
/usr/local/bin/bundler \
7274
/usr/local/bin/erb \
@@ -79,29 +81,29 @@ COPY --from=rubylang/ruby:3.0.1-focal \
7981
/usr/local/bin/ruby \
8082
/usr/local/bin/
8183

82-
COPY --from=rubylang/ruby:3.0.1-focal \
84+
COPY --from=rubylang/ruby:3.0.2-focal \
8385
/usr/local/etc/gemrc \
8486
/usr/local/etc/
8587

8688
# NOTE: DO NOT CHANGE the version in the path of include directory
87-
COPY --from=rubylang/ruby:3.0.1-focal \
89+
COPY --from=rubylang/ruby:3.0.2-focal \
8890
/usr/local/include/ruby-3.0.0/ \
8991
/usr/local/include/ruby-3.0.0/
9092

91-
COPY --from=rubylang/ruby:3.0.1-focal \
93+
COPY --from=rubylang/ruby:3.0.2-focal \
9294
/usr/local/lib/libruby.so \
9395
/usr/local/lib/libruby.so.* \
9496
/usr/local/lib/
9597

96-
COPY --from=rubylang/ruby:3.0.1-focal \
98+
COPY --from=rubylang/ruby:3.0.2-focal \
9799
/usr/local/lib/pkgconfig/ \
98100
/usr/local/lib/pkgconfig/
99101

100-
COPY --from=rubylang/ruby:3.0.1-focal \
102+
COPY --from=rubylang/ruby:3.0.2-focal \
101103
/usr/local/lib/ruby/ \
102104
/usr/local/lib/ruby/
103105

104-
COPY --from=rubylang/ruby:3.0.1-focal \
106+
COPY --from=rubylang/ruby:3.0.2-focal \
105107
/usr/local/share/man/man1/erb.1 \
106108
/usr/local/share/man/man1/irb.1 \
107109
/usr/local/share/man/man1/ri.1 \
@@ -116,18 +118,24 @@ RUN echo "gem: --user-install" >> $HOME/.gemrc
116118
ENV PATH $HOME/.local/share/gem/ruby/3.0.0/bin:$PATH
117119

118120
# Install basic gems
119-
RUN gem install pycall -v ">= 1.4.0" && \
121+
RUN \
122+
gem install irb -v ">= 1.3.8.pre.9" && \
123+
gem install iruby -v ">= 0.7.4" && \
124+
gem install pycall -v ">= 1.4.1" && \
125+
gem install numpy -v ">= 0.4.0" && \
120126
gem install matplotlib -v ">= 1.2.0" && \
121-
gem install iruby -v ">= 0.7.0" && \
127+
gem install pandas -v ">= 0.3.8" && \
128+
gem install charty -v ">= 0.2.11" && \
129+
gem install red-datasets -v ">= 0.1.4" && \
130+
gem install unicode_plot -v ">= 0.0.5" && \
131+
\
122132
gem install \
123133
activerecord \
124134
awesome_print \
125-
charty \
126135
daru \
127136
daru-view \
128137
enumerable-statistics \
129138
ffi-rzmq \
130-
irb \
131139
mysql2 \
132140
nmatrix \
133141
nmatrix-lapacke \
@@ -143,14 +151,13 @@ RUN gem install pycall -v ">= 1.4.0" && \
143151
red-arrow-numo-narray \
144152
red-arrow-nmatrix \
145153
red-chainer \
146-
red-datasets \
147154
red-datasets-arrow \
148155
red-datasets-daru \
156+
red-datasets-pandas \
149157
red-gandiva \
150158
red-parquet \
151159
red-plasma \
152160
rumale \
153-
unicode_plot \
154161
sqlite3
155162

156-
RUN iruby register
163+
RUN iruby register --force

0 commit comments

Comments
 (0)