Skip to content

Commit 17ded15

Browse files
author
Ryan Prior
committed
Updates Dockerfile to use upstream jekyll/jekyll Docker image
1 parent ce85247 commit 17ded15

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

Dockerfile

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,12 @@
1-
FROM ruby:2.7-buster
2-
3-
# Install program to configure locales as per
4-
# https://github.com/jekyll/jekyll/issues/4268#issuecomment-167406574
5-
RUN apt-get update && apt-get install -y locales
6-
RUN dpkg-reconfigure locales && \
7-
locale-gen C.UTF-8 && \
8-
/usr/sbin/update-locale LANG=C.UTF-8
9-
10-
# Install needed default locale for Makefly
11-
RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen
1+
FROM jekyll/jekyll:4
122

133
# Set default locale for the environment
144
ENV LC_ALL C.UTF-8
155
ENV LANG en_US.UTF-8
166
ENV LANGUAGE en_US.UTF-8
177

18-
RUN mkdir -p /opt/io/elementary/releases
19-
WORKDIR /opt/io/elementary/releases
20-
21-
COPY Gemfile ./
22-
RUN gem install jekyll && bundle install
8+
COPY Gemfile Gemfile.lock ./
9+
RUN bundle install
2310

2411
ENTRYPOINT ["/usr/local/bin/bundle", "exec", \
2512
"jekyll", "serve", \

bin/serve

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
cd $(git rev-parse --show-toplevel) # work from repo dir
44
docker run --rm -it \
5-
-v $(pwd):/opt/io/elementary/releases/ \
5+
-v $(pwd):/srv/jekyll/ \
66
-p 4000:4000 \
77
io.elementary.releases

0 commit comments

Comments
 (0)