Skip to content

Commit 8890d0b

Browse files
committed
Add git as a buildtime dependency
Until ruby gets its shit together
1 parent 54dbf64 commit 8890d0b

File tree

1 file changed

+20
-4
lines changed

1 file changed

+20
-4
lines changed

Dockerfile.template.patch

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/Dockerfile.template b/Dockerfile.template
2-
index 3c17e98..d19d92e 100644
2+
index 4a3fc4a..27e39b9 100644
33
--- a/Dockerfile.template
44
+++ b/Dockerfile.template
5-
@@ -55,7 +55,8 @@ ENV RUBY_DOWNLOAD_SHA256 {{ .sha256.xz }}
5+
@@ -36,7 +36,8 @@ ENV RUBY_DOWNLOAD_SHA256 {{ .sha256.xz }}
66

77
# some of ruby's build scripts are written in ruby
88
# we purge system ruby later to make sure our final image uses what we just built
@@ -12,7 +12,23 @@ index 3c17e98..d19d92e 100644
1212
\
1313
{{ if is_alpine then ( -}}
1414
apk add --no-cache --virtual .ruby-builddeps \
15-
@@ -194,12 +195,10 @@ RUN set -eux; \
15+
@@ -52,6 +53,7 @@ RUN set -eux; \
16+
dpkg-dev dpkg \
17+
g++ \
18+
gcc \
19+
+ git \
20+
gdbm-dev \
21+
glib-dev \
22+
gmp-dev \
23+
@@ -93,6 +95,7 @@ RUN set -eux; \
24+
bzip2 \
25+
g++ \
26+
gcc \
27+
+ git \
28+
libbz2-dev \
29+
libffi-dev \
30+
libgdbm-compat-dev \
31+
@@ -183,12 +186,10 @@ RUN set -eux; \
1632
fi; \
1733
{{ ) else "" end -}}
1834
\
@@ -25,7 +41,7 @@ index 3c17e98..d19d92e 100644
2541
\
2642
cd /usr/src/ruby; \
2743
\
28-
@@ -207,7 +206,7 @@ RUN set -eux; \
44+
@@ -196,7 +197,7 @@ RUN set -eux; \
2945
# https://github.com/docker-library/ruby/issues/196
3046
# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source)
3147
# 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)

0 commit comments

Comments
 (0)