Jonathan Turner hace 8 años
padre
commit
0e37b68ed7

+ 7 - 4
testenv/docker/krb5kdc-latest/README.md

@@ -3,9 +3,12 @@
 DO NOT USE THIS CONTAINER FOR ANY PRODUCTION USE!!!
 
 To run:
-
-docker run -v /etc/localtime:/etc/localtime:ro -p 88:88 -p 88:88/udp --rm --name gokrb5-TEST-kdc-lastest jcmturner/jtnet:gokrb5-test-kdc-latest-v1.0 &
+```bash
+docker run -v /etc/localtime:/etc/localtime:ro -p 88:88 -p 88:88/udp --rm --name gokrb5-kdc-latest jcmturner/gokrb5:kdc-latest &
+```
 
 To build:
-docker build -t jcmturner/jtnet:gokrb5-test-kdc-latest-v1.0 --force-rm=true --rm=true .
-docker push jcmturner/jtnet:gokrb5-test-kdc-latest-v1.0
+```bash
+docker build -t jcmturner/gokrb5:kdc-latest --force-rm=true --rm=true .
+docker push jcmturner/gokrb5:kdc-latest
+```

+ 3 - 6
testenv/docker/krb5kdc-latest/krb5kdc-init.sh

@@ -16,14 +16,14 @@ create_entropy() {
    done
 }
 
-#create_entropy &
-#ENTROPY_PID=$!
-
+create_entropy &
+ENTROPY_PID=$!
 
   echo "Kerberos initialisation required. Creating database for ${REALM} ..."
   echo "This can take a long time if there is little entropy. A process has been started to create some."
   MASTER_PASSWORD=$(echo $RANDOM$RANDOM$RANDOM | md5sum | awk '{print $1}')
   /usr/local/sbin/kdb5_util create -r ${REALM} -s -P ${MASTER_PASSWORD}
+  kill -9 ${ENTROPY_PID}
   echo "Kerberos database created."
   /usr/local/sbin/kadmin.local -q "add_principal -randkey ${ADMIN_USERNAME}/admin"
   echo "Kerberos admin user created: ${ADMIN_USERNAME} To update password: sudo /usr/sbin/kadmin.local -q \"change_password ${ADMIN_USERNAME}/admin\""
@@ -56,6 +56,3 @@ create_entropy() {
   fi
 
   echo "Kerberos initialisation complete"
-
-#Start the kdc 
-#kill -9 $ENTROPY_PID

+ 9 - 4
testenv/docker/krb5kdc/README.md

@@ -3,9 +3,14 @@
 DO NOT USE THIS CONTAINER FOR ANY PRODUCTION USE!!!
 
 To run:
-
-docker run -v /etc/localtime:/etc/localtime:ro -p 88:88 -p 88:88/udp --rm --name gokrb5-TEST-kdc jcmturner/jtnet/gokrb5-test-kdc-v1.0
+```bash
+docker run -v /etc/localtime:/etc/localtime:ro -p 88:88 -p 88:88/udp --rm --name gokrb5-kdc-centos-default jcmturner/gokrb5:kdc-centos-default &
+```
 
 To build:
-docker build -t jcmturner/jtnet:gokrb5-test-kdc-v1.0 --force-rm=true --rm=true .
-docker push jcmturner/jtnet:gokrb5-test-kdc-v1.0
+```bash
+docker build -t jcmturner/gokrb5:kdc-centos-default --force-rm=true --rm=true .
+docker push jcmturner/gokrb5:kdc-centos-default
+```
+
+

+ 1 - 3
testenv/docker/krb5kdc/krb5kdc-init.sh

@@ -24,6 +24,7 @@ ENTROPY_PID=$!
   echo "This can take a long time if there is little entropy. A process has been started to create some."
   MASTER_PASSWORD=$(echo $RANDOM$RANDOM$RANDOM | md5sum | awk '{print $1}')
   /usr/sbin/kdb5_util create -r ${REALM} -s -P ${MASTER_PASSWORD}
+  kill -9 ${ENTROPY_PID}
   echo "Kerberos database created."
   /usr/sbin/kadmin.local -q "add_principal -randkey ${ADMIN_USERNAME}/admin"
   echo "Kerberos admin user created: ${ADMIN_USERNAME} To update password: sudo /usr/sbin/kadmin.local -q \"change_password ${ADMIN_USERNAME}/admin\""
@@ -56,6 +57,3 @@ ENTROPY_PID=$!
   fi
 
   echo "Kerberos initialisation complete"
-
-#Start the kdc 
-kill -9 $ENTROPY_PID