[AIRFLOW-3003] Pull the krb5 image instead of building (apache#3844)

Pull the image instead of building it, this will speed up the CI process since we don't have to build it every time.
odracci · Jan 6, 2019 · 3fa40e7 · 3fa40e7
1 parent 46360f1
commit 3fa40e7
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 191 deletions.
diff --git a/scripts/ci/2-setup-kdc.sh b/scripts/ci/2-setup-kdc.sh
@@ -30,7 +30,7 @@ KRB5_KTNAME=/etc/airflow.keytab
 cat /etc/hosts
 echo "hostname: ${FQDN}"
 
-sudo cp $DIRNAME/krb5/krb-conf/client/krb5.conf /etc/krb5.conf
+sudo cp $DIRNAME/krb5/krb5.conf /etc/krb5.conf
 
 echo -e "${PASS}\n${PASS}" | sudo kadmin -p ${ADMIN}/admin -w ${PASS} -q "addprinc -randkey airflow/${FQDN}"
 sudo kadmin -p ${ADMIN}/admin -w ${PASS} -q "ktadd -k ${KRB5_KTNAME} airflow"

diff --git a/scripts/ci/docker-compose.yml b/scripts/ci/docker-compose.yml
@@ -57,8 +57,7 @@ services:
       - ./openldap/ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom
 
   krb5-kdc-server:
-    build: ./krb5
-    image: krb5-kdc-server
+    image: godatadriven/krb5-kdc-server
     hostname: krb5-kdc-server
     domainname: example.com
 

diff --git a/scripts/ci/krb5/Dockerfile b/scripts/ci/krb5/Dockerfile
diff --git a/scripts/ci/krb5/krb-conf/server/kadm5.acl b/scripts/ci/krb5/krb-conf/server/kadm5.acl
diff --git a/scripts/ci/krb5/krb-conf/server/kdc.conf b/scripts/ci/krb5/krb-conf/server/kdc.conf
diff --git a/scripts/ci/krb5/krb-conf/client/krb5.conf → scripts/ci/krb5/krb5.conf b/scripts/ci/krb5/krb-conf/client/krb5.conf → scripts/ci/krb5/krb5.conf
@@ -30,7 +30,7 @@ renew_lifetime = 7d
 forwardable = true
 
 [realms]
- TEST.LOCAL = {
-   kdc = krb5-kdc-server:88
-   admin_server = krb5-kdc-server
- }
+TEST.LOCAL = {
+  kdc = krb5-kdc-server:88
+  admin_server = krb5-kdc-server
+}
diff --git a/scripts/ci/krb5/start_kdc.sh b/scripts/ci/krb5/start_kdc.sh
diff --git a/scripts/ci/krb5/supervisord.conf b/scripts/ci/krb5/supervisord.conf