瀏覽代碼

update idc

Zhang Li 2 年之前
父節點
當前提交
b5f6741894
共有 3 個文件被更改,包括 21 次插入16 次删除
  1. 7 6
      Dockerfile
  2. 5 1
      Makefile
  3. 9 9
      idctest.ini

+ 7 - 6
Dockerfile

@@ -81,10 +81,7 @@ EXPOSE 8080
 
 FROM builder2 as image-dev
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
-     krb5-user
-
-
+RUN apt-get update && apt-get install -y --no-install-recommends krb5-user
 ADD . ${WORKDIR}
 RUN mv docker/dev/krb5.conf /etc/
 
@@ -92,12 +89,16 @@ 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 image-idctest
+RUN apt-get update
+RUN apt-get update && apt-get install -y --no-install-recommends krb5-user
+ADD . ${WORKDIR}
+
 # FROM builder2 as builder3
 
 # RUN apt-get update && apt-get install -y --no-install-recommends openssh-server && rm -rf /var/lib/apt/lists/*

+ 5 - 1
Makefile

@@ -23,4 +23,8 @@ deploy: image
 	@docker-compose down  && docker-compose up -d
 
 remote:
-	@ssh -t $(USER)@$(HOST) "cd $(REMOTE_WORKSPACE); make deploy"
+	@ssh -t $(USER)@$(HOST) "cd $(REMOTE_WORKSPACE); make deploy"
+
+idctest:
+	@docker build --target image-idctest -t registry.cn-hangzhou.aliyuncs.com/sxtest/$(NAME):idctest .
+	@docker push registry.cn-hangzhou.aliyuncs.com/sxtest/$(NAME):idctest

+ 9 - 9
idctest.ini

@@ -7,24 +7,24 @@ port = 3306
 ssl_disabled = true
 
 [MINIO]
-k8s_url = aihub-minio-yili-test:9000
-url = aihub-minio-yili-test:9000
+k8s_url = aihub-dag-minio:9000
+url = aihub-dag-minio:9000
 access_key = minioadmin
 secret_key = minioadmin
 
 
 [AF_BACKEND]
-uri=aihub-backend-af-yili-test:8080
-host=aihub-backend-af-yili-test
+uri=aihub-dag-backend-af:8080
+host=aihub-dag-backend-af
 port=8080
 dag_files_dir=/dags/
 
 [K8S]
 image_pull_key=codingregistrykey
-enable_kerberos=true
+enable_kerberos=false
 
 [BACKEND]
-url=aihub-backend-yili-test:8080
+url=aihub-dag-backend:8080
 
 [AIRFLOW]
 uri=airflow-webserver:8080
@@ -34,10 +34,10 @@ api_token=YWRtaW46YWRtaW4=
 [HIVE]
 host = 10.254.20.22
 port = 7001
-username = hive
+username = aiuser
 password = hive
 database_name = ailab
-kerberos = 1
+kerberos = 0
 keytab = assets/test/user.keytab
 krb5config = assets/test/krb5.conf
 kerberos_service_name = hadoop
@@ -45,7 +45,7 @@ principal = ailab@EMR-5XJSY31F
 
 
 [HIVE_METASTORE]
-uris=thrift://10.254.20.18:7004,thrift://10.254.20.22:7004
+uris=thrift://10.116.1.72:9083
 
 [TASK_IMAGES]
 datax=yldc-docker.pkg.coding.yili.com/aiplatform/docker/aihub-datax-yili:latest