diff --git a/Dockerfile b/Dockerfile index 5f1f7b26..e4dc51ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,15 +11,14 @@ MAINTAINER Daniel Hunacek ENV DEBIAN_FRONTEND noninteractive # Install dependencies -RUN apt-get update -RUN apt-get upgrade -y -RUN apt-get install -y -q build-essential ruby-full python python-docutils ruby-bundler libicu-dev libreadline-dev libssl-dev zlib1g-dev git-core -RUN apt-get clean -RUN rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/* +RUN apt-get update && \ + apt-get upgrade -y && \ + apt-get install -y -q build-essential ruby-full python python-docutils ruby-bundler libicu-dev libreadline-dev libssl-dev zlib1g-dev git-core cmake && \ + apt-get clean && \ + rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/* # Install gollum -RUN gem install gollum redcarpet github-markdown -RUN gem install omniauth-github omnigollum github-markup +RUN gem install gollum redcarpet github-markdown omniauth-github omnigollum github-markup # Initialize wiki data RUN mkdir /root/wikidata @@ -30,11 +29,11 @@ WORKDIR /root/wikidata # Patch gollum for omnigollum RUN export GEM_DIR=$(dirname "$(gem which gollum)") -RUN cp -r /root/wikidata/gollum-patch/css/* "$(dirname "$(gem which gollum)")/gollum/public/gollum/css" -RUN cp -r /root/wikidata/gollum-patch/templates/* "$(dirname "$(gem which gollum)")/gollum/templates" -RUN cp -r /root/wikidata/gollum-patch/views/* "$(dirname "$(gem which gollum)")/gollum/views" +RUN cp -r /root/wikidata/gollum-patch/css/* "$(dirname "$(gem which gollum)")/gollum/public/gollum/css" && \ + cp -r /root/wikidata/gollum-patch/templates/* "$(dirname "$(gem which gollum)")/gollum/templates" && \ + cp -r /root/wikidata/gollum-patch/views/* "$(dirname "$(gem which gollum)")/gollum/views" # Expose gollum port 80 EXPOSE 80 -ENTRYPOINT ["/usr/local/bin/gollum", "/root/wikidata", "--config", "config.rb", "--port", "80"] \ No newline at end of file +ENTRYPOINT ["/usr/local/bin/gollum", "/root/wikidata", "--config", "config.rb", "--port", "80"]