Skip to content
Snippets Groups Projects
Commit e30d8e0c authored by Jordon Bedwell's avatar Jordon Bedwell
Browse files

Fix broken Gems on recent Bundler updates.

parent 4f734fca
No related branches found
No related tags found
No related merge requests found
...@@ -175,10 +175,15 @@ RUN mkdir -p $JEKYLL_DATA_DIR ...@@ -175,10 +175,15 @@ RUN mkdir -p $JEKYLL_DATA_DIR
RUN chown -R jekyll:jekyll $JEKYLL_DATA_DIR RUN chown -R jekyll:jekyll $JEKYLL_DATA_DIR
RUN chown -R jekyll:jekyll $JEKYLL_VAR_DIR RUN chown -R jekyll:jekyll $JEKYLL_VAR_DIR
RUN chown -R jekyll:jekyll $BUNDLE_HOME RUN chown -R jekyll:jekyll $BUNDLE_HOME
RUN rm -rf /root/.gem
RUN rm -rf /home/jekyll/.gem RUN rm -rf /home/jekyll/.gem
RUN rm -rf $BUNDLE_HOME/cache RUN rm -rf $BUNDLE_HOME/cache
RUN rm -rf $GEM_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"] CMD ["jekyll", "--help"]
ENTRYPOINT ["/usr/jekyll/bin/entrypoint"] ENTRYPOINT ["/usr/jekyll/bin/entrypoint"]
......
...@@ -18,11 +18,11 @@ fi ...@@ -18,11 +18,11 @@ fi
if [ "$1" = "install" ] || [ "$1" = "clean" ] || [ "$1" = "update" ]; then if [ "$1" = "install" ] || [ "$1" = "clean" ] || [ "$1" = "update" ]; then
if [ "$(stat -c '%U' "$BUNDLE_HOME")" != "jekyll" ]; then if [ "$(stat -c '%U' "$BUNDLE_HOME")" != "jekyll" ]; then
chown -R jekyll:jekyll /usr/gem/cache/bundle
chown -R jekyll:jekyll "$BUNDLE_HOME" chown -R jekyll:jekyll "$BUNDLE_HOME"
fi fi
fi fi
if [ "$1" = "install" ] || [ "$1" = "update" ]; then if [ "$1" = "install" ] || [ "$1" = "update" ]; then
# There is no need to report that we are using check. # 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 if [ "$1" = "update" ] || ! su-exec jekyll $exe check 1>/dev/null 2>&1; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment