mirror of
https://github.com/cwinfo/powerdns-admin.git
synced 2024-12-29 06:25:40 +00:00
add new dockerfile with s6 overlay and multiple proccesses to have background jobs updating accounts and zones
This commit is contained in:
parent
00dc23f21b
commit
700fa0d9ce
@ -83,7 +83,7 @@ ARG S6_VERSION=v2.2.0.3
|
|||||||
ENV FLASK_APP=/app/powerdnsadmin/__init__.py \
|
ENV FLASK_APP=/app/powerdnsadmin/__init__.py \
|
||||||
USER=pda
|
USER=pda
|
||||||
|
|
||||||
RUN apk add --no-cache mariadb-connector-c postgresql-client py3-gunicorn py3-psycopg2 xmlsec tzdata libcap && \
|
RUN apk add --no-cache mariadb-connector-c postgresql-client py3-gunicorn py3-psycopg2 xmlsec tzdata libcap apk-cron && \
|
||||||
addgroup -S ${USER} && \
|
addgroup -S ${USER} && \
|
||||||
adduser -S -D -G ${USER} ${USER} && \
|
adduser -S -D -G ${USER} ${USER} && \
|
||||||
mkdir /data && \
|
mkdir /data && \
|
||||||
@ -99,12 +99,27 @@ COPY ./docker/entrypoint.sh /usr/bin/
|
|||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
RUN chown ${USER}:${USER} ./configs /app && \
|
RUN chown ${USER}:${USER} ./configs /app && \
|
||||||
cat ./powerdnsadmin/default_config.py ./configs/docker_config.py > ./powerdnsadmin/docker_config.py
|
cat ./powerdnsadmin/default_config.py ./configs/docker_config.py > ./powerdnsadmin/docker_config.py
|
||||||
|
|
||||||
# Add s6 overlay, so we can manage multiple processes
|
# Add s6 overlay, so we can manage multiple processes
|
||||||
ADD https://github.com/just-containers/s6-overlay/releases/download/$S6_VERSION/s6-overlay-amd64-installer /tmp/
|
ADD https://github.com/just-containers/s6-overlay/releases/download/$S6_VERSION/s6-overlay-amd64-installer /tmp/
|
||||||
RUN chmod +x /tmp/s6-overlay-amd64-installer && /tmp/s6-overlay-amd64-installer /
|
RUN chmod +x /tmp/s6-overlay-amd64-installer && /tmp/s6-overlay-amd64-installer /
|
||||||
RUN mkdir /etc/services.d/gunicorn && echo $'#!/usr/bin/execlineb -P\nwith-contenv\n' > /etc/services.d/gunicorn/run && echo "s6-setuidgid $USER" >> /etc/services.d/gunicorn/run && echo $'\n/usr/bin/entrypoint.sh gunicorn powerdnsadmin:create_app()' >> /etc/services.d/gunicorn/run && chmod +x /etc/services.d/gunicorn/run
|
|
||||||
|
# Create service script for gunicorn
|
||||||
|
RUN mkdir /etc/services.d/gunicorn && \
|
||||||
|
echo $'#!/usr/bin/execlineb -P\nwith-contenv\n' > /etc/services.d/gunicorn/run && \
|
||||||
|
echo "s6-setuidgid $USER" >> /etc/services.d/gunicorn/run && \
|
||||||
|
echo $'\n/usr/bin/entrypoint.sh gunicorn powerdnsadmin:create_app()' >> /etc/services.d/gunicorn/run && \
|
||||||
|
chmod +x /etc/services.d/gunicorn/run
|
||||||
|
|
||||||
|
# Create service script for cron
|
||||||
|
RUN mkdir /etc/services.d/cron && \
|
||||||
|
echo $'#!/usr/bin/execlineb -P\ncrond -f\n' > /etc/services.d/cron/run && \
|
||||||
|
chmod +x /etc/services.d/cron/run
|
||||||
|
|
||||||
|
# Add crontab entries
|
||||||
|
RUN echo "*/5 * * * * python3 /app/update_zones.py" >> /etc/crontabs/$USER && \
|
||||||
|
echo "*/5 * * * * python3 /app/update_accounts.py" >> /etc/crontabs/$USER
|
||||||
|
|
||||||
EXPOSE 80/tcp
|
EXPOSE 80/tcp
|
||||||
#USER ${USER}
|
|
||||||
HEALTHCHECK CMD ["wget","--output-document=-","--quiet","--tries=1","http://127.0.0.1/"]
|
HEALTHCHECK CMD ["wget","--output-document=-","--quiet","--tries=1","http://127.0.0.1/"]
|
||||||
ENTRYPOINT ["/init"]
|
ENTRYPOINT ["/init"]
|
||||||
|
@ -25,7 +25,9 @@ with app.app_context():
|
|||||||
|
|
||||||
### Check if bg_domain_updates is set to true
|
### Check if bg_domain_updates is set to true
|
||||||
if not status:
|
if not status:
|
||||||
app.logger.error('Please turn on "bg_domain_updates" setting to run this job.')
|
app.logger.debug('"bg_domain_updates" is disabled, exiting')
|
||||||
sys.exit(1)
|
sys.exit(0)
|
||||||
|
|
||||||
|
### Start the update process
|
||||||
|
app.logger.info('Update accounts from nameserver API')
|
||||||
Account().update()
|
Account().update()
|
||||||
|
@ -16,7 +16,6 @@ import logging
|
|||||||
from powerdnsadmin import create_app
|
from powerdnsadmin import create_app
|
||||||
from powerdnsadmin.models.domain import Domain
|
from powerdnsadmin.models.domain import Domain
|
||||||
from powerdnsadmin.models.setting import Setting
|
from powerdnsadmin.models.setting import Setting
|
||||||
|
|
||||||
app = create_app()
|
app = create_app()
|
||||||
app.logger.setLevel(logging.INFO)
|
app.logger.setLevel(logging.INFO)
|
||||||
|
|
||||||
@ -25,8 +24,8 @@ with app.app_context():
|
|||||||
|
|
||||||
### Check if bg_domain_updates is set to true
|
### Check if bg_domain_updates is set to true
|
||||||
if not status:
|
if not status:
|
||||||
app.logger.error('Please turn on "bg_domain_updates" setting to run this job.')
|
app.logger.debug('"bg_domain_updates" is disabled, exiting')
|
||||||
sys.exit(1)
|
sys.exit(0)
|
||||||
|
|
||||||
### Start the update process
|
### Start the update process
|
||||||
app.logger.info('Update domains from nameserver API')
|
app.logger.info('Update domains from nameserver API')
|
||||||
|
Loading…
Reference in New Issue
Block a user