From e87d5b386e97c537b6875bb88a339c865a018da5 Mon Sep 17 00:00:00 2001 From: Nils Jakobi Date: Mon, 8 Oct 2018 18:40:44 -0500 Subject: [PATCH] Update Dockerfile CMD replaced by ENTRYPOINT, also mkdir is not necessary when using WORKDIR --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d0adb57..cd3fdb3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,6 @@ FROM nginx:1 MAINTAINER Freifunk Rhein-Sieg e.V. EXPOSE 80 -RUN mkdir -p /project/ WORKDIR /project RUN apt-get update -y && apt-get install -y git ruby ruby-dev rubygems build-essential cron RUN gem install bundle @@ -10,4 +9,4 @@ RUN git init && git remote add origin https://github.com/Freifunk-Rhein-Sieg/fre RUN touch /etc/cron.d/update && touch /srv/update.sh && chmod 775 /srv/update.sh && chmod 644 /etc/cron.d/update && touch /var/log/cron.log RUN echo "cd /project && git pull origin master && /usr/local/bin/jekyll build && rm -rf /usr/share/nginx/html/* && cp -r _site/* /usr/share/nginx/html" > /srv/update.sh RUN echo "*/30 * * * * root /srv/update.sh >> /var/log/cron.log 2>&1" > /etc/cron.d/update -CMD git fetch && git pull origin master && bundle install && bundle exec jekyll build && rm -rf /usr/share/nginx/html/* && cp -r _site/* /usr/share/nginx/html && echo "ready" && /etc/init.d/cron start && nginx -g "daemon off;" +ENTRYPOINT git fetch && git pull origin master && bundle install && bundle exec jekyll build && rm -rf /usr/share/nginx/html/* && cp -r _site/* /usr/share/nginx/html && echo "ready" && /etc/init.d/cron start && nginx -g "daemon off;"