From 4841899dc74d133885d32e070e758f6f80bf6cca Mon Sep 17 00:00:00 2001 From: Wojciech Kozlowski Date: Tue, 11 Dec 2018 20:34:04 +0000 Subject: [PATCH] Script cleanup --- Makefile | 29 ++++------------------------- base/Dockerfile | 11 ----------- certbot/Dockerfile | 10 ++++++++-- dokuwiki/Dockerfile | 12 ++++++++++-- nextcloud/cron/Dockerfile | 11 +++++++---- proxy/Dockerfile | 5 ++++- runner/Dockerfile | 5 ++++- runner/main/Dockerfile | 5 +++++ 8 files changed, 42 insertions(+), 46 deletions(-) delete mode 100644 base/Dockerfile diff --git a/Makefile b/Makefile index 2477c76..44719a0 100644 --- a/Makefile +++ b/Makefile @@ -24,26 +24,6 @@ DOCKER_REGISTRY = registry.wojciechkozlowski.eu/wojtek/loki default: all -# ----------------------------------------------------------------------------- -# base -# ----------------------------------------------------------------------------- - -base-clean: - docker rmi $(DOCKER_REGISTRY)/base || /bin/true - -base-build: - docker build -f base/Dockerfile \ - -t $(DOCKER_REGISTRY)/base \ - ./base - -base-push: - docker push $(DOCKER_REGISTRY)/base - -base-pull: - docker pull $(DOCKER_REGISTRY)/base - -base: base-clean base-build base-push - # ----------------------------------------------------------------------------- # wiki # ----------------------------------------------------------------------------- @@ -51,7 +31,7 @@ base: base-clean base-build base-push wiki-clean: docker rmi $(DOCKER_REGISTRY)/wiki || /bin/true -wiki-build: base-build +wiki-build: docker-compose build wiki wiki-push: @@ -105,7 +85,7 @@ proxy: proxy-clean proxy-build proxy-push certbot-clean: docker rmi $(DOCKER_REGISTRY)/certbot || /bin/true -certbot-build: base-build +certbot-build: docker-compose build certbot certbot-push: @@ -125,7 +105,7 @@ certbot: certbot-clean certbot-build certbot-push runner-base-clean: docker rmi $(DOCKER_REGISTRY)/runner-base || /bin/true -runner-base-build: base-build +runner-base-build: docker build -f runner/Dockerfile \ -t $(DOCKER_REGISTRY)/runner-base \ ./runner @@ -201,7 +181,6 @@ clean-all: docker image prune -a -f clean-builds: \ - base-clean \ wiki-clean \ nextcloud-cron-clean \ proxy-clean \ @@ -210,7 +189,7 @@ clean-builds: \ runner-main-clean \ runner-docker-clean -build-all: base-build runner-base-build +build-all: runner-base-build docker-compose build push-all: diff --git a/base/Dockerfile b/base/Dockerfile deleted file mode 100644 index f615c2b..0000000 --- a/base/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM debian - -ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update && apt-get -y upgrade - -RUN apt-get -y install \ - build-essential \ - python3 \ - python3-pip \ - python \ - python-pip diff --git a/certbot/Dockerfile b/certbot/Dockerfile index 05f4925..0dac4f0 100644 --- a/certbot/Dockerfile +++ b/certbot/Dockerfile @@ -1,6 +1,12 @@ -FROM registry.wojciechkozlowski.eu/wojtek/loki/base +FROM debian:stable-slim -RUN apt-get -y install certbot cron supervisor +ENV DEBIAN_FRONTEND noninteractive +RUN apt-get update && apt-get -y upgrade + +RUN apt-get -y install \ + certbot \ + cron \ + supervisor ADD certbot.cron /etc/cron.d/certbot diff --git a/dokuwiki/Dockerfile b/dokuwiki/Dockerfile index 37e9e81..3334633 100644 --- a/dokuwiki/Dockerfile +++ b/dokuwiki/Dockerfile @@ -1,9 +1,17 @@ -FROM registry.wojciechkozlowski.eu/wojtek/loki/base +FROM debian:stable-slim + +ENV DEBIAN_FRONTEND noninteractive +RUN apt-get update && apt-get -y upgrade ENV HTML_PATH /usr/share/nginx/html ENV DOKU_VOL /var/dokuwiki-storage -RUN apt-get -y install wget php7.0-fpm php7.0-xml nginx supervisor +RUN apt-get -y install \ + wget \ + php7.0-fpm \ + php7.0-xml \ + nginx \ + supervisor RUN sed -i -e "s|cgi.fix_pathinfo=1|cgi.fix_pathinfo=0|g" /etc/php/7.0/fpm/php.ini && \ mkdir /run/php diff --git a/nextcloud/cron/Dockerfile b/nextcloud/cron/Dockerfile index 7efe8d7..fe91b6a 100644 --- a/nextcloud/cron/Dockerfile +++ b/nextcloud/cron/Dockerfile @@ -1,10 +1,13 @@ FROM nextcloud:fpm ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update && apt-get -y upgrade && apt-get -y install \ - supervisor \ - cron \ - && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get -y upgrade + +RUN apt-get -y install \ + supervisor \ + cron + +RUN rm -rf /var/lib/apt/lists/* RUN mkdir /var/log/supervisord /var/run/supervisord && \ echo "*/15 * * * * su - www-data -s /bin/bash -c \"php -f /var/www/html/cron.php\""| crontab - diff --git a/proxy/Dockerfile b/proxy/Dockerfile index f9b09c3..059818e 100644 --- a/proxy/Dockerfile +++ b/proxy/Dockerfile @@ -1,5 +1,8 @@ FROM nginx ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update && apt-get -y upgrade && apt -y install openssl +RUN apt-get update && apt-get -y upgrade + +RUN apt -y install openssl + RUN mkdir /etc/nginx/cert && openssl dhparam -out /etc/nginx/cert/dhparam.pem 2048 diff --git a/runner/Dockerfile b/runner/Dockerfile index 042660c..77e0950 100644 --- a/runner/Dockerfile +++ b/runner/Dockerfile @@ -1,4 +1,7 @@ -FROM registry.wojciechkozlowski.eu/wojtek/loki/base +FROM debian:stable-slim + +ENV DEBIAN_FRONTEND noninteractive +RUN apt-get update && apt-get -y upgrade # Add files to setup GitLab repo ADD script.deb.sh /tmp/script.deb.sh diff --git a/runner/main/Dockerfile b/runner/main/Dockerfile index 25f800a..846210a 100644 --- a/runner/main/Dockerfile +++ b/runner/main/Dockerfile @@ -1,3 +1,8 @@ FROM registry.wojciechkozlowski.eu/wojtek/loki/runner-base +RUN apt-get -y install \ + build-essential \ + python3 \ + python3-pip + RUN pip3 install pycodestyle coverage