Compare commits

..

7 Commits

Author SHA1 Message Date
Deon George
5bf8664e2a Added cron labels, fixed SSHD 2017-04-19 21:55:33 +10:00
Deon George
0009e461d1 Add lamp to apache group; Add VOLUME for ssh 2017-01-25 22:35:10 +11:00
Deon George
a7c60d11ed Disabled gitlib runner built for improved container caching 2016-08-23 11:24:03 +10:00
Deon George
45dca773b7 Updated permission for 10-default files 2016-08-23 09:57:54 +10:00
Deon George
0ccfe0a1a7 Updated permissions on COPY files 2016-08-23 09:47:32 +10:00
Deon George
82f0b2d452 Updated gitlab runner php is 5.4 2016-08-11 12:31:27 +10:00
Deon George
8db8d4fb7f Enabled runner to run on php55, php56 and php70 2016-08-11 12:21:57 +10:00
3 changed files with 7 additions and 24 deletions

View File

@ -1 +1,2 @@
.git/
image*bz2 image*bz2

View File

@ -1,24 +1,5 @@
# NAME leenooks/lamps # NAME leenooks/lamps
# VERSION php55 # VERSION php54
# 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 FROM registry.leenooks.net/leenooks/base:7
@ -26,10 +7,8 @@ RUN yum -y install epel-release && yum clean all
RUN yum -y install tsmpipe && yum clean all RUN yum -y install tsmpipe && yum clean all
RUN yum -y install http://rpms.famillecollet.com/enterprise/remi-release-7.rpm && yum clean all && rm -rf /var/tmp/*
# EPEL & Leenooks packages # EPEL & Leenooks packages
RUN yum -y install --enabler remi-php55 \ RUN yum -y install \
httpd \ httpd \
mariadb-server \ mariadb-server \
php \ php \
@ -61,6 +40,9 @@ RUN useradd -c "Hosting Admin User" -m lamp -G apache
VOLUME [ "/etc/ssh" ] VOLUME [ "/etc/ssh" ]
EXPOSE 80 443 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 # Starting
COPY init /sbin/ COPY init /sbin/
ENTRYPOINT [ "/sbin/init" ] ENTRYPOINT [ "/sbin/init" ]

2
init
View File

@ -38,7 +38,7 @@ if [ "$1" == "start" ]; then
echo "Starting SSHD..." echo "Starting SSHD..."
getent passwd lamp || useradd -c "Hosting Admin User" -m lamp getent passwd lamp || useradd -c "Hosting Admin User" -m lamp
[ -x /usr/sbin/sshd-keygen ] && /usr/sbin/sshd-keygen [ -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 else
echo "! NOT starting SSH" echo "! NOT starting SSH"
fi fi