Script cleanup
This commit is contained in:
parent
c7aba25ba9
commit
4841899dc7
29
Makefile
29
Makefile
@ -24,26 +24,6 @@ DOCKER_REGISTRY = registry.wojciechkozlowski.eu/wojtek/loki
|
|||||||
|
|
||||||
default: all
|
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
|
# wiki
|
||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
@ -51,7 +31,7 @@ base: base-clean base-build base-push
|
|||||||
wiki-clean:
|
wiki-clean:
|
||||||
docker rmi $(DOCKER_REGISTRY)/wiki || /bin/true
|
docker rmi $(DOCKER_REGISTRY)/wiki || /bin/true
|
||||||
|
|
||||||
wiki-build: base-build
|
wiki-build:
|
||||||
docker-compose build wiki
|
docker-compose build wiki
|
||||||
|
|
||||||
wiki-push:
|
wiki-push:
|
||||||
@ -105,7 +85,7 @@ proxy: proxy-clean proxy-build proxy-push
|
|||||||
certbot-clean:
|
certbot-clean:
|
||||||
docker rmi $(DOCKER_REGISTRY)/certbot || /bin/true
|
docker rmi $(DOCKER_REGISTRY)/certbot || /bin/true
|
||||||
|
|
||||||
certbot-build: base-build
|
certbot-build:
|
||||||
docker-compose build certbot
|
docker-compose build certbot
|
||||||
|
|
||||||
certbot-push:
|
certbot-push:
|
||||||
@ -125,7 +105,7 @@ certbot: certbot-clean certbot-build certbot-push
|
|||||||
runner-base-clean:
|
runner-base-clean:
|
||||||
docker rmi $(DOCKER_REGISTRY)/runner-base || /bin/true
|
docker rmi $(DOCKER_REGISTRY)/runner-base || /bin/true
|
||||||
|
|
||||||
runner-base-build: base-build
|
runner-base-build:
|
||||||
docker build -f runner/Dockerfile \
|
docker build -f runner/Dockerfile \
|
||||||
-t $(DOCKER_REGISTRY)/runner-base \
|
-t $(DOCKER_REGISTRY)/runner-base \
|
||||||
./runner
|
./runner
|
||||||
@ -201,7 +181,6 @@ clean-all:
|
|||||||
docker image prune -a -f
|
docker image prune -a -f
|
||||||
|
|
||||||
clean-builds: \
|
clean-builds: \
|
||||||
base-clean \
|
|
||||||
wiki-clean \
|
wiki-clean \
|
||||||
nextcloud-cron-clean \
|
nextcloud-cron-clean \
|
||||||
proxy-clean \
|
proxy-clean \
|
||||||
@ -210,7 +189,7 @@ clean-builds: \
|
|||||||
runner-main-clean \
|
runner-main-clean \
|
||||||
runner-docker-clean
|
runner-docker-clean
|
||||||
|
|
||||||
build-all: base-build runner-base-build
|
build-all: runner-base-build
|
||||||
docker-compose build
|
docker-compose build
|
||||||
|
|
||||||
push-all:
|
push-all:
|
||||||
|
@ -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
|
|
@ -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
|
ADD certbot.cron /etc/cron.d/certbot
|
||||||
|
|
||||||
|
@ -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 HTML_PATH /usr/share/nginx/html
|
||||||
ENV DOKU_VOL /var/dokuwiki-storage
|
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 && \
|
RUN sed -i -e "s|cgi.fix_pathinfo=1|cgi.fix_pathinfo=0|g" /etc/php/7.0/fpm/php.ini && \
|
||||||
mkdir /run/php
|
mkdir /run/php
|
||||||
|
@ -1,10 +1,13 @@
|
|||||||
FROM nextcloud:fpm
|
FROM nextcloud:fpm
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND noninteractive
|
ENV DEBIAN_FRONTEND noninteractive
|
||||||
RUN apt-get update && apt-get -y upgrade && apt-get -y install \
|
RUN apt-get update && apt-get -y upgrade
|
||||||
|
|
||||||
|
RUN apt-get -y install \
|
||||||
supervisor \
|
supervisor \
|
||||||
cron \
|
cron
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
RUN rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
RUN mkdir /var/log/supervisord /var/run/supervisord && \
|
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 -
|
echo "*/15 * * * * su - www-data -s /bin/bash -c \"php -f /var/www/html/cron.php\""| crontab -
|
||||||
|
@ -1,5 +1,8 @@
|
|||||||
FROM nginx
|
FROM nginx
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND noninteractive
|
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
|
RUN mkdir /etc/nginx/cert && openssl dhparam -out /etc/nginx/cert/dhparam.pem 2048
|
||||||
|
@ -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 files to setup GitLab repo
|
||||||
ADD script.deb.sh /tmp/script.deb.sh
|
ADD script.deb.sh /tmp/script.deb.sh
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
FROM registry.wojciechkozlowski.eu/wojtek/loki/runner-base
|
FROM registry.wojciechkozlowski.eu/wojtek/loki/runner-base
|
||||||
|
|
||||||
|
RUN apt-get -y install \
|
||||||
|
build-essential \
|
||||||
|
python3 \
|
||||||
|
python3-pip
|
||||||
|
|
||||||
RUN pip3 install pycodestyle coverage
|
RUN pip3 install pycodestyle coverage
|
||||||
|
Reference in New Issue
Block a user