travis build

.travis.yml

@@ -23,7 +23,7 @@ before_install:
   - docker run -d -h kdc.test.gokrb5 -v /etc/localtime:/etc/localtime:ro -p 88:88 -p 88:88/udp --name krb5kdc jcmturner/gokrb5:kdc-centos-default
   - docker run -d -h kdc.test.gokrb5 -v /etc/localtime:/etc/localtime:ro -p 78:88 -p 78:88/udp --name krb5kdc-old jcmturner/gokrb5:kdc-older
   - docker run -d -h kdc.test.gokrb5 -v /etc/localtime:/etc/localtime:ro -p 98:88 -p 98:88/udp --name krb5kdc-latest jcmturner/gokrb5:kdc-latest
-  - docker run -d --add-host host.test.gokrb5:127.0.0.1 -v /etc/localtime:/etc/localtime:ro -p 80:80 -p 443:443 --name gokrb5-http jcmturner/gokrb5:http
+  - docker run -d --add-host host.test.gokrb5:127.0.0.88 -v /etc/localtime:/etc/localtime:ro -p 80:80 -p 443:443 --name gokrb5-http jcmturner/gokrb5:http
 
 env:
   - TEST_KDC_ADDR=127.0.0.1 TEST_HTTP_URL="http://host.test.gokrb5/index.html"

testenv/docker/krb5kdc-latest/Dockerfile

@@ -3,11 +3,13 @@ MAINTAINER Jonathan Turner <jt@jtnet.co.uk>
 
 EXPOSE 88
 
+ENTRYPOINT ["/usr/local/sbin/krb5kdc", "-n"]
+
 RUN yum install -y \
   tcpdump krb5-workstation vim \
   ncurses telnet ncurses-devel tcl net-tools \
  && yum groupinstall "Development Tools" -y \
- && yum clean all
+ && yum update -y && yum clean all
 
 ADD krb5-1.15.1.tar.gz /tmp
 RUN cd /tmp/krb5-1.15.1/src && \
@@ -19,9 +21,7 @@ ADD kadm5.acl /usr/local/var/krb5kdc/kadm5.acl
 ADD krb5kdc-init.sh /opt/krb5/bin/krb5kdc-init.sh
 RUN mkdir -p /opt/krb5/log && \
   mkdir -p /var/log/kerberos && \
-  chmod 700 /opt/krb5/bin/krb5kdc-init.sh && /opt/krb5/bin/krb5kdc-init.sh && \
+  /bin/bash /opt/krb5/bin/krb5kdc-init.sh && \
   ln -sf /dev/stdout /var/log/krb5kdc.log
 
-ENTRYPOINT ["/usr/local/sbin/krb5kdc", "-n"]
 
-RUN yum update -y && yum clean all

testenv/docker/krb5kdc-older/Dockerfile

@@ -3,11 +3,13 @@ MAINTAINER Jonathan Turner <jt@jtnet.co.uk>
 
 EXPOSE 88
 
+ENTRYPOINT ["/usr/local/sbin/krb5kdc", "-n"]
+
 RUN yum install -y \
   tcpdump krb5-workstation vim \
   ncurses telnet ncurses-devel tcl net-tools \
  && yum groupinstall "Development Tools" -y \
- && yum clean all
+ && yum update -y && yum clean all
 
 ADD krb5-1.6.3.tar.gz /tmp
 RUN cd /tmp/krb5-1.6.3/src && \
@@ -19,9 +21,5 @@ ADD kadm5.acl /usr/local/var/krb5kdc/kadm5.acl
 ADD krb5kdc-init.sh /opt/krb5/bin/krb5kdc-init.sh
 RUN mkdir -p /opt/krb5/log && \
   mkdir -p /var/log/kerberos && \
-  chmod 700 /opt/krb5/bin/krb5kdc-init.sh && /opt/krb5/bin/krb5kdc-init.sh && \
+  /bin/bash /opt/krb5/bin/krb5kdc-init.sh && \
   ln -sf /dev/stdout /var/log/krb5kdc.log
-
-ENTRYPOINT ["/usr/local/sbin/krb5kdc", "-n"]
-
-RUN yum update -y && yum clean all

testenv/docker/krb5kdc/Dockerfile

@@ -2,11 +2,12 @@ FROM centos:latest
 MAINTAINER Jonathan Turner <jt@jtnet.co.uk>
 
 EXPOSE 88
+ENTRYPOINT ["/usr/sbin/krb5kdc", "-n"]
 
 RUN yum install -y \
   krb5-server \
   tcpdump krb5-workstation vim \
- && yum clean all
+ && yum update -y && yum clean all
 
 ADD krb5.conf /etc/krb5.conf
 ADD kdc.conf /var/kerberos/krb5kdc/kdc.conf
@@ -14,9 +15,5 @@ ADD kadm5.acl /var/kerberos/krb5kdc/kadm5.acl
 ADD krb5kdc-init.sh /opt/krb5/bin/krb5kdc-init.sh
 RUN mkdir -p /opt/krb5/log && \
   mkdir -p /var/log/kerberos && \
-  chmod 700 /opt/krb5/bin/krb5kdc-init.sh && /opt/krb5/bin/krb5kdc-init.sh && \
+  /bin/bash /opt/krb5/bin/krb5kdc-init.sh && \
   ln -sf /dev/stdout /var/log/krb5kdc.log
-
-ENTRYPOINT ["/usr/sbin/krb5kdc", "-n"]
-
-RUN yum update -y && yum clean all

testenv/docker/krbhttp/Dockerfile

@@ -10,16 +10,16 @@ RUN yum install -y \
   mod_auth_kerb \
   mod_ssl \
   tcpdump krb5-workstation vim \
- && yum clean all
+  && yum update -y && yum clean all
 
-ADD krb5.conf /etc/krb5.conf
-ADD http.testtab /etc/httpd/
 ADD httpd-krb5.conf /etc/httpd/conf.d/
 ADD index.html /var/www/html/index.html
-RUN ln -sf /dev/stdout /var/log/httpd/access_log && \
- ln -sf /dev/stdout /var/log/httpd/ssl_access_log && \
- ln -sf /dev/stdout /var/log/httpd/ssl_request_log && \
- ln -sf /dev/stderr /var/log/httpd/error_log && \
- ln -sf /dev/stderr /var/log/httpd/ssl_error_log
+ADD krb5.conf /etc/krb5.conf
+ADD http.testtab /etc/httpd/
+#RUN ln -sf /dev/stdout /var/log/httpd/access_log && \
+# ln -sf /dev/stdout /var/log/httpd/ssl_access_log && \
+# ln -sf /dev/stdout /var/log/httpd/ssl_request_log && \
+# ln -sf /dev/stderr /var/log/httpd/error_log && \
+# ln -sf /dev/stderr /var/log/httpd/ssl_error_log
+
 
-RUN yum update -y && yum clean all