Migrate docker-cmd.sh to entrypoint

This commit is contained in:
Peter Schiffer 2018-11-22 19:45:43 +01:00
parent 338d106d67
commit a5f38cc6d5
No known key found for this signature in database
GPG key ID: 6CCC5046E2B0B44B
8 changed files with 23 additions and 14 deletions

View file

@ -6,13 +6,14 @@ RUN dnf -y --setopt=install_weak_deps=False install \
uwsgi-plugin-python3 \
&& dnf clean all
COPY docker-cmd.sh /
EXPOSE 9494
VOLUME [ "/opt/powerdns-admin/upload" ]
COPY docker-entrypoint.sh /
COPY pdns-admin.ini /etc/uwsgi.d/
RUN chown uwsgi: /etc/uwsgi.d/pdns-admin.ini
CMD [ "/docker-cmd.sh" ]
ENTRYPOINT [ "/docker-entrypoint.sh" ]
CMD [ "/usr/sbin/uwsgi", "--ini", "/etc/uwsgi.ini" ]

View file

@ -52,4 +52,4 @@ $MYSQL_COMMAND ${PDNS_ADMIN_SQLA_DB_NAME//\'/} -e "UPDATE setting SET value='${P
mkdir -p /run/uwsgi
chown uwsgi: /run/uwsgi
exec /usr/sbin/uwsgi --ini /etc/uwsgi.ini
exec "$@"

View file

@ -18,6 +18,8 @@ ENV VERSION=4.1 \
EXPOSE 53 53/udp
COPY recursor.conf.tpl /
COPY docker-cmd.sh /
COPY docker-entrypoint.sh /
CMD [ "/docker-cmd.sh" ]
ENTRYPOINT [ "/docker-entrypoint.sh" ]
CMD [ "/usr/sbin/pdns_recursor" ]

View file

@ -18,6 +18,8 @@ ENV VERSION=4.1 \
EXPOSE 53 53/udp
COPY recursor.conf.tpl /
COPY docker-cmd.sh /
COPY docker-entrypoint.sh /
CMD [ "/docker-cmd.sh" ]
ENTRYPOINT [ "/docker-entrypoint.sh" ]
CMD [ "/usr/sbin/pdns_recursor" ]

View file

@ -23,4 +23,4 @@ envtpl < /recursor.conf.tpl > $config_file
# Fix config file ownership
chown ${pdns_user}: $config_file
exec /usr/sbin/pdns_recursor
exec "$@"

View file

@ -19,6 +19,8 @@ ENV VERSION=4.1 \
EXPOSE 53 53/udp
COPY pdns.conf.tpl /
COPY docker-cmd.sh /
COPY docker-entrypoint.sh /
CMD [ "/docker-cmd.sh" ]
ENTRYPOINT [ "/docker-entrypoint.sh" ]
CMD [ "/usr/sbin/pdns_server" ]

View file

@ -19,6 +19,8 @@ ENV VERSION=4.1 \
EXPOSE 53 53/udp
COPY pdns.conf.tpl /
COPY docker-cmd.sh /
COPY docker-entrypoint.sh /
CMD [ "/docker-cmd.sh" ]
ENTRYPOINT [ "/docker-entrypoint.sh" ]
CMD [ "/usr/sbin/pdns_server" ]

View file

@ -43,4 +43,4 @@ if [ "${SUPERMASTER_IPS:-}" ]; then
$MYSQL_COMMAND -D "$PDNS_gmysql_dbname" -e "$MYSQL_INSERT_SUPERMASTERS"
fi
exec /usr/sbin/pdns_server
exec "$@"