Initial commit

.gitlab-ci.yml

 stages: 
   - package
   - build
+<<<<<<< HEAD
+#  - deplay
+=======
+<<<<<<< HEAD
+#  - deplay
+=======
   - deplay
+>>>>>>> 41f4ea5 (Initial commit)
+>>>>>>> df0998c (Initial commit)
 
 variables:
   APP_NAME: "mobdna-k8s"
@@ -31,7 +39,15 @@ mvn_package:
     - ls ;  cd target ; ls -lh
     - md5sum mob-dna-1.0.jar
   only:
+<<<<<<< HEAD
+    - master
+=======
+<<<<<<< HEAD
+    - master
+=======
     - delete_file
+>>>>>>> 41f4ea5 (Initial commit)
+>>>>>>> df0998c (Initial commit)
   tags:
     - mobdna-k8s
 

Dockerfile

 FROM 502302443508.dkr.ecr.cn-north-1.amazonaws.com.cn/mobdna:basic
 
+<<<<<<< HEAD
+#RUN yum install tar unzip  procps iproute lsof glibc-all-langpacks -y ; yum clean all
+
+=======
+<<<<<<< HEAD
+#RUN yum install tar unzip  procps iproute lsof glibc-all-langpacks -y ; yum clean all
+
+=======
+>>>>>>> 41f4ea5 (Initial commit)
+>>>>>>> df0998c (Initial commit)
 # tomcat
 COPY mob-dna-1.0.jar /data/application/mobdna
 RUN md5sum /data/application/mobdna/mob-dna-1.0.jar