Skip to content

Commit

Permalink
Fix Docker Problem (alshedivat#1074)
Browse files Browse the repository at this point in the history
  • Loading branch information
pourmand1376 authored and pecey committed Jan 27, 2023
1 parent b369cb9 commit 78016bb
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 13 deletions.
33 changes: 22 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,24 @@
FROM jekyll/jekyll
FROM bitnami/minideb:latest
Label MAINTAINER Amir Pourmand
#install imagemagick tool for convert command
RUN apk add --no-cache --virtual .build-deps \
libxml2-dev \
shadow \
autoconf \
g++ \
make \
&& apk add --no-cache imagemagick-dev imagemagick
RUN apt-get update -y
# add locale
RUN apt-get -y install locales
# Set the locale
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
locale-gen
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8

# add ruby and jekyll
RUN apt-get install --no-install-recommends ruby-full build-essential zlib1g-dev -y
RUN apt-get install imagemagick -y
RUN apt-get clean \
&& rm -rf /var/lib/apt/lists/
# ENV GEM_HOME='root/gems' \
# PATH="root/gems/bin:${PATH}"
RUN gem install jekyll bundler
RUN mkdir /srv/jekyll
ADD Gemfile /srv/jekyll
WORKDIR /srv/jekyll
ADD Gemfile /srv/jekyll/
RUN bundle install
RUN bundle install
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
container_name: al-folio-website
command: bash -c "
rm -f Gemfile.lock
&& bundler exec jekyll serve --watch --port=8080 --host=0.0.0.0 --livereload --verbose"
&& bundler exec jekyll serve --watch --port=8080 --host=0.0.0.0 --livereload --verbose --trace"
ports:
- 8080:8080
volumes:
Expand Down
3 changes: 2 additions & 1 deletion docker-local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ version: "3"
services:
jekyll_custom:
build: .
image: al-folio-local-docker
container_name: al-folio-local-website
command: bash -c "
rm -f Gemfile.lock
&& bundler exec jekyll serve --watch --port=8080 --host=0.0.0.0 --livereload --verbose"
&& bundler exec jekyll serve --watch --port=8080 --host=0.0.0.0 --livereload --verbose --trace"
ports:
- 8080:8080
volumes:
Expand Down

0 comments on commit 78016bb

Please sign in to comment.