alair 4 місяців тому
батько
коміт
263b7f3e7c
3 змінених файлів з 1 додано та 116 видалено
  1. 1 1
      Jenkinsfile-admin
  2. 0 57
      ruoyi-admin-deploy.yaml
  3. 0 58
      ruoyi-ui-deploy.yaml

+ 1 - 1
Jenkinsfile-admin

@@ -27,7 +27,7 @@ pipeline{
         }
         stage('通过Docker制作自定义镜像') {
             steps {
-                sh '''mv ./target/*.jar ./docker/
+                sh '''mv ./ruoyi-admin/target/*.jar ./docker/
                 docker build -t ${JOB_NAME}:latest ./docker/'''
             }
         }

+ 0 - 57
ruoyi-admin-deploy.yaml

@@ -1,57 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  namespace: ruoyi
-  name: ruoyi-admin
-  labels:
-    app: ruoyi-admin
-spec:
-  replicas: 2
-  selector:
-    matchLabels:
-      app: ruoyi-admin
-  template:
-    metadata:
-      labels:
-        app: ruoyi-admin
-    spec:
-      containers:
-        - name: ruoyi-admin
-          image: 192.168.0.5:9080/repo/ruoyi-admin:latest
-          imagePullPolicy: Always
-          ports:
-            - containerPort: 8080
----
-apiVersion: v1
-kind: Service
-metadata:
-  namespace: ruoyi
-  labels:
-    app: ruoyi-admin
-  name: ruoyi-admin
-spec:
-  selector:
-    app: ruoyi-admin
-  ports:
-    - port: 18081
-      targetPort: 8080
-  type: ClusterIP
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: ruoyi-admin
-  namespace: ruoyi
-spec:
-  ingressClassName: traefik
-  rules:
-    - host: ruoyi.autumn.com
-      http:
-        paths:
-          - path: /api/v1
-            pathType: Prefix
-            backend:
-              service:
-                name: ruoyi
-                port:
-                  number: 18081

+ 0 - 58
ruoyi-ui-deploy.yaml

@@ -1,58 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  namespace: ruoyi
-  name: ruoyi-ui
-  labels:
-    app: ruoyi-ui
-spec:
-  replicas: 2
-  selector:
-    matchLabels:
-      app: ruoyi-ui
-  template:
-    metadata:
-      labels:
-        app: ruoyi-ui
-    spec:
-      containers:
-        - name: ruoyi-ui
-          image: 192.168.0.5:9080/repo/ruoyi-ui:latest
-          imagePullPolicy: Always
-          ports:
-            - containerPort: 80
----
-apiVersion: v1
-kind: Service
-metadata:
-  namespace: ruoyi
-  labels:
-    app: ruoyi-ui
-  name: ruoyi-ui
-spec:
-  selector:
-    app: ruoyi-ui
-  ports:
-    - protocol: TCP
-      port: 80
-      targetPort: 80
-  type: ClusterIP
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: ruoyi-admin
-  namespace: ruoyi
-spec:
-  ingressClassName: traefik
-  rules:
-    - host: ruoyi.autumn.com
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: ruoyi-ui
-                port:
-                  number: 80