Skip to content

Commit 443cae0

Browse files
committed
Update dockerfile patch
It doesn't apply cleanly anymore
1 parent 7d57795 commit 443cae0

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Dockerfile.template.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/Dockerfile.template b/Dockerfile.template
2-
index 4a3fc4a..27e39b9 100644
2+
index 9f9a685..2a6530d 100644
33
--- a/Dockerfile.template
44
+++ b/Dockerfile.template
55
@@ -36,7 +36,8 @@ ENV RUBY_DOWNLOAD_SHA256 {{ .sha256.xz }}
@@ -28,9 +28,9 @@ index 4a3fc4a..27e39b9 100644
2828
libbz2-dev \
2929
libffi-dev \
3030
libgdbm-compat-dev \
31-
@@ -183,12 +186,10 @@ RUN set -eux; \
31+
@@ -181,12 +184,10 @@ RUN set -eux; \
32+
cargo --version; \
3233
fi; \
33-
{{ ) else "" end -}}
3434
\
3535
- wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \
3636
echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \
@@ -41,7 +41,7 @@ index 4a3fc4a..27e39b9 100644
4141
\
4242
cd /usr/src/ruby; \
4343
\
44-
@@ -196,7 +197,7 @@ RUN set -eux; \
44+
@@ -194,7 +195,7 @@ RUN set -eux; \
4545
# https://github.com/docker-library/ruby/issues/196
4646
# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source)
4747
# 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)