Merge remote-tracking branch 'origin/master'

Dockerfile

@@ -74,9 +74,25 @@ stdout_logfile_maxbytes=50MB\n\
 environment=PYTHONUNBUFFERED=1\n\
 " > /etc/supervisor/conf.d/be.conf
 
-ADD . ${WORKDIR}
 EXPOSE 8080
 
+FROM builder2 as image-dev
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+     krb5-user
+
+
+ADD . ${WORKDIR}
+RUN mv docker/dev/krb5.conf /etc/
+
+
+
+FROM builder2 as image-test
+RUN apt-get update && apt-get install -y --no-install-recommends krb5-user
+
+
+ADD . ${WORKDIR}
+RUN mv docker/test/krb5.conf /etc/
 
 
 # FROM builder2 as builder3

Makefile

@@ -11,7 +11,7 @@ HOST=192.168.199.107
 
 all: image publish
 image:
-	@docker build -t registry.cn-hangzhou.aliyuncs.com/sxtest/$(NAME):$(VERSION) .
+	@docker build --target image-dev -t registry.cn-hangzhou.aliyuncs.com/sxtest/$(NAME):$(VERSION) .
 
 publish:
 	@docker push registry.cn-hangzhou.aliyuncs.com/sxtest/$(NAME):$(VERSION)

docker-compose.yml

@@ -17,5 +17,5 @@ services:
       - '18224:22'
     extra_hosts:
       - 'minio-api.sxkj.com:192.168.199.109'
-    # environment:
-    #   - APP_ENV=development
+    environment:
+     - APP_ENV=development

docker/dev/krb5.conf

@@ -0,0 +1,27 @@
+[libdefaults]
+    dns_lookup_realm = false
+    dns_lookup_kdc = false
+    ticket_lifetime = 24h
+    renew_lifetime = 7d
+    forwardable = true
+    rdns = false
+    default_realm = EMR-5XJSY31F
+    default_tgs_enctypes = des3-cbc-sha1
+    default_tkt_enctypes = des3-cbc-sha1
+    permitted_enctypes = des3-cbc-sha1
+    kdc_timeout = 3000
+    max_retries = 3
+[realms]
+    EMR-5XJSY31F = {
+
+        kdc = 10.254.20.18:88
+        admin_server = 10.254.20.18
+        kdc = 10.254.20.22:88
+		admin_server = 10.254.20.22
+
+    }
+
+[domain_realm]
+# .example.com = EXAMPLE.COM
+
+

docker/java/Dockerfile.java

@@ -1,5 +0,0 @@
-FROM maven:3.8.6-openjdk-8 as builder
-
-WORKDIR /workspace
-RUN sed -i "s@http://\(deb\|security\).debian.org@https://mirrors.aliyun.com@g" /etc/apt/sources.list
-

docker/test/krb5.conf

@@ -0,0 +1,27 @@
+[libdefaults]
+    dns_lookup_realm = false
+    dns_lookup_kdc = false
+    ticket_lifetime = 24h
+    renew_lifetime = 7d
+    forwardable = true
+    rdns = false
+    default_realm = EMR-5XJSY31F
+    default_tgs_enctypes = des3-cbc-sha1
+    default_tkt_enctypes = des3-cbc-sha1
+    permitted_enctypes = des3-cbc-sha1
+    kdc_timeout = 3000
+    max_retries = 3
+[realms]
+    EMR-5XJSY31F = {
+
+        kdc = 10.254.20.18:88
+        admin_server = 10.254.20.18
+        kdc = 10.254.20.22:88
+		admin_server = 10.254.20.22
+
+    }
+
+[domain_realm]
+# .example.com = EXAMPLE.COM
+
+

production.ini

@@ -5,33 +5,33 @@ db_name = aihubtest_dag_admin_db
 host = 10.254.12.7
 port = 3306
 [MINIO]
-k8s_url=minio.default:9000
+k8s_url = aihub-minio-yili-test:9000
 url = aihub-minio-yili-test:9000
 access_key = minioadmin
 secret_key = minioadmin
 [AIRFLOW]
-host_in_header=airflow-web.sxkj.com
-ip_address=192.168.199.109
+host_in_header=airflow-web-test.digitalyili.com
+ip_address = aihub-backend-af-yili-test:8080
 api_token=YWRtaW46YWRtaW4=
 dag_files_dir=/dags/
 host = aihub-backend-af-yili-test
 port = 8080
 [HIVE]
-host = 192.168.199.27
-port = 10000
+host = 10.254.20.22
+port = 7001
 username = hive
 password = hive
 database_name = default
-kerberos = 0
+kerberos = 1
 keytab = configs/user.keytab
 krb5config = configs/krb5.conf
 kerberos_service_name = hadoop
 principal = ailab@EMR-5XJSY31F
 [TASK_IMAGES]
-datax=SXKJ:32775/pod_datax:0.9
-python=SXKJ:32775/pod_python:1.1
-java=SXKJ:32775/java:1.0
-sparks=SXKJ:32775/jupyter:0.96
+datax=yldc-docker.pkg.coding.yili.com/aiplatform/docker/aihub-datax-yili:latest
+python=yldc-docker.pkg.coding.yili.com/aiplatform/docker/aihub-minio-yili-test:python
+java=yldc-docker.pkg.coding.yili.com/aiplatform/docker/aihub-minio-yili-test:java
+sparks=yldc-docker.pkg.coding.yili.com/aiplatform/docker/aihub-minio-yili-test:spark