Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jekyll-docker
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
envygeeks
jekyll-docker
Commits
e30d8e0c
Commit
e30d8e0c
authored
5 years ago
by
Jordon Bedwell
Browse files
Options
Downloads
Patches
Plain Diff
Fix broken Gems on recent Bundler updates.
parent
4f734fca
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
repos/jekyll/Dockerfile
+6
-1
6 additions, 1 deletion
repos/jekyll/Dockerfile
repos/jekyll/copy/all/usr/jekyll/bin/bundle
+1
-1
1 addition, 1 deletion
repos/jekyll/copy/all/usr/jekyll/bin/bundle
with
7 additions
and
2 deletions
repos/jekyll/Dockerfile
+
6
−
1
View file @
e30d8e0c
...
@@ -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"]
...
...
This diff is collapsed.
Click to expand it.
repos/jekyll/copy/all/usr/jekyll/bin/bundle
+
1
−
1
View file @
e30d8e0c
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment