diff --git a/Dockerfile b/Dockerfile index 2a500ac..b61f42d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,24 +1,5 @@ # NAME leenooks/lamps # VERSION php56 -# BUILD docker build -t="leenooks/lamps" . -# START docker run -dp 80:80 [-p 443:443 ] -p 2022:22 \ -# -e NO_MAIL=TRUE \ -# -e NO_DB=TRUE \ -# -v /srv/lamps/sites.d:/etc/httpd/sites.d \ -# -v /srv/lamps/sites.html:/var/www/sites \ -# -v /srv/lamps/mariadb/server.cnf:/etc/my.cnf.d/server.cnf -# -v /srv/lamps/mariadb/data:/var/lib/mysql -# -v /srv/lamps/user:/home/lamp \ -# -v /srv/lamps/mail/opendkim:/etc/opendkim \ -# -v /srv/lamps/mail/sendmail.mc:/etc/mail/sendmail.mc \ -# -v /srv/lamps/tsm/TSM.PWD:/etc/adsm/TSM.PWD \ -# -v /srv/lamps/tsm/dsm.sys:/etc/adsm/TSM.PWD \ -# -v /dev/log:/dev/log \ -# -v /srv/lamps/dsm.sys:/opt/tivoli/tsm/client/api/bin64/dsm.sys \ -# -v /srv/lamps/dsm.opt:/opt/tivoli/tsm/client/api/bin64/dsm.opt \ -# --hostname=www.example.com \ -# --restart=always --name=lamp leenooks/hosting $@ -# CRON: docker exec -it lamp /usr/sbin/awstats.sh FROM registry.leenooks.net/leenooks/base:7 @@ -61,6 +42,9 @@ RUN useradd -c "Hosting Admin User" -m lamp -G apache VOLUME [ "/etc/ssh" ] EXPOSE 80 443 +LABEL cron.hourly root:/usr/sbin/awstats.sh +LABEL cron.daily root:/usr/bin/tdp.mysql.sh -s information_schema:performance_schema + # Starting COPY init /sbin/ ENTRYPOINT [ "/sbin/init" ] diff --git a/init b/init index 65933a3..39dc409 100755 --- a/init +++ b/init @@ -38,7 +38,7 @@ if [ "$1" == "start" ]; then echo "Starting SSHD..." getent passwd lamp || useradd -c "Hosting Admin User" -m lamp [ -x /usr/sbin/sshd-keygen ] && /usr/sbin/sshd-keygen - [ -x /usr/sbin/sshd ] && /usr/sbin/sshd + [ -x /usr/sbin/sshd ] && /usr/sbin/sshd -D & else echo "! NOT starting SSH" fi