更新dockerfile

Author: yangmv

Dockerfile

@@ -21,14 +21,17 @@ ADD . /var/www/CMDB/
 RUN pip3 install --user --upgrade pip
 RUN pip3 install -r /var/www/CMDB/requirements.txt
 
-# 5. 数据初始化
+# 5.准备配置文件
+RUN cp  /var/www/CMDB/cmdb-example.conf /var/www/CMDB/cmdb.conf
+
+# 6. 数据初始化
 RUN python3 /var/www/CMDB/manage.py makemigrations
 RUN python3 /var/www/CMDB/manage.py migrate
 
-# 6. 日志
+# 7. 日志
 VOLUME /var/log/
 
-# 7. 准备文件
+# 8. 准备文件
 COPY docs/supervisor_cmdb.conf  /etc/supervisord.conf
 COPY docs/nginx_cmdb.conf /etc/nginx/conf.d/
 

Jenkinsfile

@@ -7,36 +7,26 @@ node('haimaxy-jnlp') {
         }
     }
     stage('Test') {
-      echo "2.代码测试[PAAS]"
+        echo "2.代码测试[PAAS]"
     }
     stage('Build') {
         echo "3.构建打包 Docker 镜像"
-        sh "docker build -t harbor-k8s.shinezone.com/ops/flask-demo:${build_tag} ."
+        sh "docker build -t harbor-k8s.shinezone.com/ops/codo-cmdb:${build_tag} ."
     }
     stage('Push') {
         echo "4.推送 Docker 镜像到仓库"
         withCredentials([usernamePassword(credentialsId: 'dockerHubSZ', passwordVariable: 'dockerHubSZPassword', usernameVariable: 'dockerHubSZUser')]) {
             sh "docker login -u ${dockerHubSZUser} -p ${dockerHubSZPassword} https://harbor-k8s.shinezone.com"
-            sh "docker push harbor-k8s.shinezone.com/ops/flask-demo:${build_tag}"
+            sh "docker push harbor-k8s.shinezone.com/ops/codo-cmdb:${build_tag}"
         }
     }
     stage('YAML') {
         echo "5.YAML配置"
-        sh "sed -i 's/<BUILD_TAG>/${build_tag}/' flask-demo-deploy.yaml"
-        sh "sed -i 's/<PORT>/${port}/' flask-demo-deploy.yaml"
-        sh "sed -i 's/<PORT>/${port}/' flask-demo-ingress.yaml"
-        sh "sed -i 's/<DOMAIN>/${domain}/' flask-demo-ingress.yaml"
+        sh "sed -i 's/<BUILD_TAG>/${build_tag}/' deploy.yaml"
+        sh "sed -i 's/<DOMAIN>/${domain}/' deploy.yaml"
     }
     stage('Deploy') {
         echo "6.开始部署"
-        //if (userInput == "Dev") {
-            //sh "kubectl apply -f flask-demo-deploy.yaml -n dev"
-        //} else if (userInput == "QA"){
-            //sh "kubectl apply -f flask-demo-deploy.yaml -n qa"
-        //} else {
-            //sh "kubectl apply -f flask-demo-deploy.yaml -n release"
-        //}
-        sh "kubectl apply -f flask-demo-deploy.yaml -n ${namespace}"
-        sh "kubectl apply -f flask-demo-ingress.yaml -n ${namespace}"
+        sh "kubectl apply -f deploy.yaml -n ${namespace}"
     }
 }

deploy.yaml

@@ -0,0 +1,67 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: codo-cmdb
+spec:
+  replicas: 2
+  selector:
+    matchLabels:
+      app: codo-cmdb
+  template:
+    metadata:
+      labels:
+        app: codo-cmdb
+    spec:
+      containers:
+      - name: codo-cmdb
+        image: harbor-k8s.shinezone.com/ops/codo-cmdb:<BUILD_TAG>
+        imagePullPolicy: IfNotPresent
+#        lifecycle:
+#          postStart:
+#            exec:
+#              command: ['/bin/sh', '-c', 'sed -i "s/s_hostname/$(hostname)/" /data1/www/templates/app.html']
+        ports:
+        - name: http
+          containerPort: <PORT>
+        volumeMounts:
+            - name: cmdbconf
+              mountPath: /var/www/CMDB/
+              readOnly: true
+      volumes:
+        - name: cmdbconf
+          configMap:
+            name: cmdb-conf
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: codo-cmdb
+  labels:
+    app: codo-cmdb
+spec:
+  selector:
+    app: codo-cmdb
+  #type: NodePort
+  type: ClusterIP
+  ports:
+  - name: http
+    port: 80
+    targetPort: 80
+
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: codo-cmdb-ingress
+  annotations:
+    kubernetes.io/ingress.class: "nginx"
+spec:
+  rules:
+  - host: <DOMAIN>
+    http:
+      paths:
+      - path:
+        backend:
+          serviceName: codo-cmdb
+          servicePort: 80