Skip to content

Commit 78016bb

Browse files
pourmand1376pecey
authored andcommitted
Fix Docker Problem (alshedivat#1074)
1 parent b369cb9 commit 78016bb

File tree

3 files changed

+25
-13
lines changed

3 files changed

+25
-13
lines changed

Dockerfile

+22-11
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
1-
FROM jekyll/jekyll
1+
FROM bitnami/minideb:latest
22
Label MAINTAINER Amir Pourmand
3-
#install imagemagick tool for convert command
4-
RUN apk add --no-cache --virtual .build-deps \
5-
libxml2-dev \
6-
shadow \
7-
autoconf \
8-
g++ \
9-
make \
10-
&& apk add --no-cache imagemagick-dev imagemagick
3+
RUN apt-get update -y
4+
# add locale
5+
RUN apt-get -y install locales
6+
# Set the locale
7+
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
8+
locale-gen
9+
ENV LANG en_US.UTF-8
10+
ENV LANGUAGE en_US:en
11+
ENV LC_ALL en_US.UTF-8
12+
13+
# add ruby and jekyll
14+
RUN apt-get install --no-install-recommends ruby-full build-essential zlib1g-dev -y
15+
RUN apt-get install imagemagick -y
16+
RUN apt-get clean \
17+
&& rm -rf /var/lib/apt/lists/
18+
# ENV GEM_HOME='root/gems' \
19+
# PATH="root/gems/bin:${PATH}"
20+
RUN gem install jekyll bundler
21+
RUN mkdir /srv/jekyll
22+
ADD Gemfile /srv/jekyll
1123
WORKDIR /srv/jekyll
12-
ADD Gemfile /srv/jekyll/
13-
RUN bundle install
24+
RUN bundle install

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
container_name: al-folio-website
77
command: bash -c "
88
rm -f Gemfile.lock
9-
&& bundler exec jekyll serve --watch --port=8080 --host=0.0.0.0 --livereload --verbose"
9+
&& bundler exec jekyll serve --watch --port=8080 --host=0.0.0.0 --livereload --verbose --trace"
1010
ports:
1111
- 8080:8080
1212
volumes:

docker-local.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ version: "3"
33
services:
44
jekyll_custom:
55
build: .
6+
image: al-folio-local-docker
67
container_name: al-folio-local-website
78
command: bash -c "
89
rm -f Gemfile.lock
9-
&& bundler exec jekyll serve --watch --port=8080 --host=0.0.0.0 --livereload --verbose"
10+
&& bundler exec jekyll serve --watch --port=8080 --host=0.0.0.0 --livereload --verbose --trace"
1011
ports:
1112
- 8080:8080
1213
volumes:

0 commit comments

Comments
 (0)