Bladeren bron

add idctest

Zhang Li 2 jaren geleden
bovenliggende
commit
62f0d77aa7
3 gewijzigde bestanden met toevoegingen van 37 en 12 verwijderingen
  1. 12 6
      Dockerfile
  2. 7 6
      Makefile
  3. 18 0
      config-idctest.yaml

+ 12 - 6
Dockerfile

@@ -28,15 +28,9 @@ redirect_stderr=true\n\
 stdout_logfile=/var/log/be.log\n\
 stdout_logfile_maxbytes=50MB\n\
 " > /etc/supervisor.d/be.ini
-
 EXPOSE 8080
-ENTRYPOINT ["supervisord", "-n"]
-
-
 
 
-FROM builder as image-sxkj
-COPY config-sxkj.yaml config.yaml
 RUN echo -e "\
 [program:helm]\n\
 directory=/app\n\
@@ -50,3 +44,15 @@ stdout_logfile_maxbytes=50MB\n\
 " > /etc/supervisor.d/helm.ini
 EXPOSE 8081
 
+ENTRYPOINT ["supervisord", "-n"]
+
+
+
+
+FROM builder as image-sxkj
+# kubeconfig
+COPY config-sxkj.yaml config.yaml
+
+FROM builder as image-idctest
+# kubeconfig
+COPY config-idctest.yaml config.yaml

+ 7 - 6
Makefile

@@ -1,13 +1,10 @@
-NAME=backendhelm
+NAME=helmbe
 VERSION=latest
 BUILD_TIME      := $(shell date "+%F %T")
 COMMIT_SHA1     := $(shell git rev-parse HEAD)
 AUTHOR          := $(shell git show -s --format='%an')
-REMOTE_WORKSPACE=/home/sxkj/liweiquan/datax-admin
-USER=sxkj
-HOST=192.168.199.110
 
-.PHONY: image publish
+.PHONY: idctest sxkj
 
 all:
 
@@ -17,4 +14,8 @@ idctest:
 
 sxkj:
 	@docker build --target image-sxkj -t SXKJ:32775/$(NAME):sxkj .
-	@docker push SXKJ:32775/$(NAME):sxkj
+	@docker push SXKJ:32775/$(NAME):sxkj
+
+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

File diff suppressed because it is too large
+ 18 - 0
config-idctest.yaml


Some files were not shown because too many files changed in this diff