From e30d8e0cd29fc2f3000e4cb12af9da92363fc705 Mon Sep 17 00:00:00 2001
From: Jordon Bedwell <jordon@envygeeks.io>
Date: Thu, 30 Apr 2020 07:34:39 -0500
Subject: [PATCH] Fix broken Gems on recent Bundler updates.
---
repos/jekyll/Dockerfile | 7 ++++++-
repos/jekyll/copy/all/usr/jekyll/bin/bundle | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/repos/jekyll/Dockerfile b/repos/jekyll/Dockerfile
index ad8e5fa..ff472ff 100644
--- a/repos/jekyll/Dockerfile
+++ b/repos/jekyll/Dockerfile
@@ -175,10 +175,15 @@ RUN mkdir -p $JEKYLL_DATA_DIR
RUN chown -R jekyll:jekyll $JEKYLL_DATA_DIR
RUN chown -R jekyll:jekyll $JEKYLL_VAR_DIR
RUN chown -R jekyll:jekyll $BUNDLE_HOME
-RUN rm -rf /root/.gem
RUN rm -rf /home/jekyll/.gem
RUN rm -rf $BUNDLE_HOME/cache
RUN rm -rf $GEM_HOME/cache
+RUN rm -rf /root/.gem
+
+# Work around rubygems/rubygems#3572
+RUN mkdir -p /usr/gem/cache/bundle
+RUN chown -R jekyll:jekyll \
+ /usr/gem/cache/bundle
CMD ["jekyll", "--help"]
ENTRYPOINT ["/usr/jekyll/bin/entrypoint"]
diff --git a/repos/jekyll/copy/all/usr/jekyll/bin/bundle b/repos/jekyll/copy/all/usr/jekyll/bin/bundle
index 3e8903c..98957eb 100755
--- a/repos/jekyll/copy/all/usr/jekyll/bin/bundle
+++ b/repos/jekyll/copy/all/usr/jekyll/bin/bundle
@@ -18,11 +18,11 @@ fi
if [ "$1" = "install" ] || [ "$1" = "clean" ] || [ "$1" = "update" ]; then
if [ "$(stat -c '%U' "$BUNDLE_HOME")" != "jekyll" ]; then
+ chown -R jekyll:jekyll /usr/gem/cache/bundle
chown -R jekyll:jekyll "$BUNDLE_HOME"
fi
fi
-
if [ "$1" = "install" ] || [ "$1" = "update" ]; then
# There is no need to report that we are using check.
if [ "$1" = "update" ] || ! su-exec jekyll $exe check 1>/dev/null 2>&1; then
--
GitLab