upd drone dev

.drone.yml

@@ -17,63 +17,91 @@ steps:
   - cd /usr/share/repos/$DRONE_REPO_NAME
   - git checkout $DRONE_COMMIT_BRANCH 
   - git pull origin $DRONE_COMMIT_BRANCH
-- name: build
+# - name: build
-  environment:
+#   environment:
-   DOCKER_TLS_VERIFY: 1
+#    DOCKER_TLS_VERIFY: 1
-   DOCKER_HOST: "tcp://192.168.49.2:2376"
+#    DOCKER_HOST: "tcp://192.168.49.2:2376"
-   DOCKER_CERT_PATH: "/home/hogweed1/.minikube/certs"
+#    DOCKER_CERT_PATH: "/home/hogweed1/.minikube/certs"
-   MINIKUBE_ACTIVE_DOCKERD: "minikube"
+#    MINIKUBE_ACTIVE_DOCKERD: "minikube"
-  commands: 
+#   commands: 
-  - cd /usr/share/repos/$DRONE_REPO_NAME
+#   - cd /usr/share/repos/$DRONE_REPO_NAME
-  - git checkout $DRONE_COMMIT_BRANCH 
+#   - git checkout $DRONE_COMMIT_BRANCH 
-  - docker build . -t ${DRONE_REPO_NAME}:${DRONE_COMMIT_BRANCH}-"$(git rev-parse --short HEAD)"
+#   - docker build . -t ${DRONE_REPO_NAME}:${DRONE_COMMIT_BRANCH}-"$(git rev-parse --short HEAD)"
-  - docker tag ${DRONE_REPO_NAME}:${DRONE_COMMIT_BRANCH}-"$(git rev-parse --short HEAD)" ${DRONE_REPO_NAME}:latest
+#   - docker tag ${DRONE_REPO_NAME}:${DRONE_COMMIT_BRANCH}-"$(git rev-parse --short HEAD)" ${DRONE_REPO_NAME}:latest
-  - docker tag ${DRONE_REPO_NAME}:${DRONE_COMMIT_BRANCH}-"$(git rev-parse --short HEAD)" ${DRONE_REPO_NAME}:${DRONE_COMMIT_BRANCH} 
+#   - docker tag ${DRONE_REPO_NAME}:${DRONE_COMMIT_BRANCH}-"$(git rev-parse --short HEAD)" ${DRONE_REPO_NAME}:${DRONE_COMMIT_BRANCH}
 - name: build to harbor
   commands: 
   - cd /usr/share/repos/$DRONE_REPO_NAME
   - git checkout $DRONE_COMMIT_BRANCH 
-  - docker build . -t ${DRONE_REPO_NAME}:${DRONE_COMMIT_BRANCH}-"$(git rev-parse --short HEAD)"
+  #- docker build . -t ${DRONE_REPO_NAME}:${DRONE_COMMIT_BRANCH}-"$(git rev-parse --short HEAD)"
-  - docker tag ${DRONE_REPO_NAME}:${DRONE_COMMIT_BRANCH}-"$(git rev-parse --short HEAD)" harbor.guaranteedstruggle.host/library/${DRONE_REPO_NAME}:latest
+  #- docker tag ${DRONE_REPO_NAME}:${DRONE_COMMIT_BRANCH}-"$(git rev-parse --short HEAD)" harbor.guaranteedstruggle.host/library/${DRONE_REPO_NAME}:latest
-  - docker tag ${DRONE_REPO_NAME}:${DRONE_COMMIT_BRANCH}-"$(git rev-parse --short HEAD)" harbor.guaranteedstruggle.host/library/${DRONE_REPO_NAME}:${DRONE_COMMIT_BRANCH}
+  #- docker tag ${DRONE_REPO_NAME}:${DRONE_COMMIT_BRANCH}-"$(git rev-parse --short HEAD)" harbor.guaranteedstruggle.host/library/${DRONE_REPO_NAME}:${DRONE_COMMIT_BRANCH}
+  - docker build . -t harbor.guaranteedstruggle.host/library/${DRONE_REPO_NAME}:${DRONE_COMMIT_BRANCH}
   - docker login harbor.guaranteedstruggle.host -u 'robot$drono' -p valgBwMgcB86azvmuezTOC3omjXZ1NZe
   - docker push harbor.guaranteedstruggle.host/library/${DRONE_REPO_NAME}:${DRONE_COMMIT_BRANCH}
 
 
 - name: restart deployment master
   environment:
-   DOCKER_TLS_VERIFY: 1
+   KUBECONFIG: /etc/kubernetes/admin.conf
-   DOCKER_HOST: "tcp://192.168.49.2:2376"
-   DOCKER_CERT_PATH: "/home/hogweed1/.minikube/certs"
-   MINIKUBE_ACTIVE_DOCKERD: "minikube"
   commands: 
-  - su - hogweed1 -c "minikube kubectl -- rollout restart -n vdk2ch deployment flask-htmx-master"
+  - kubectl rollout restart -n vdk2ch deployment flask-htmx-master
   when:
     branch:
     - master-of-slaves
 
 - name: restart deployment dev
   environment:
-   DOCKER_TLS_VERIFY: 1
+   KUBECONFIG: /etc/kubernetes/admin.conf
-   DOCKER_HOST: "tcp://192.168.49.2:2376"
-   DOCKER_CERT_PATH: "/home/hogweed1/.minikube/certs"
-   MINIKUBE_ACTIVE_DOCKERD: "minikube"
   commands: 
-  - su - hogweed1 -c "minikube kubectl -- rollout restart -n vdk2ch deployment flask-htmx-dev"
+  - kubectl rollout restart -n vdk2ch deployment flask-htmx-dev
   when:
     branch:
     - dev
 
 - name: restart deployment our-style
   environment:
-   DOCKER_TLS_VERIFY: 1
+   KUBECONFIG: /etc/kubernetes/admin.conf
-   DOCKER_HOST: "tcp://192.168.49.2:2376"
-   DOCKER_CERT_PATH: "/home/hogweed1/.minikube/certs"
-   MINIKUBE_ACTIVE_DOCKERD: "minikube"
   commands: 
-  - su - hogweed1 -c "minikube kubectl -- rollout restart -n vdk2ch deployment flask-htmx-our-style"
+  - kubectl rollout restart -n vdk2ch deployment flask-htmx-our-style
   when:
     branch:
      - our-style
 
+# - name: restart deployment master
+#   environment:
+#    DOCKER_TLS_VERIFY: 1
+#    DOCKER_HOST: "tcp://192.168.49.2:2376"
+#    DOCKER_CERT_PATH: "/home/hogweed1/.minikube/certs"
+#    MINIKUBE_ACTIVE_DOCKERD: "minikube"
+#   commands: 
+#   - su - hogweed1 -c "minikube kubectl -- rollout restart -n vdk2ch deployment flask-htmx-master"
+#   when:
+#     branch:
+#     - master-of-slaves
+
+# - name: restart deployment dev
+#   environment:
+#    DOCKER_TLS_VERIFY: 1
+#    DOCKER_HOST: "tcp://192.168.49.2:2376"
+#    DOCKER_CERT_PATH: "/home/hogweed1/.minikube/certs"
+#    MINIKUBE_ACTIVE_DOCKERD: "minikube"
+#   commands: 
+#   - su - hogweed1 -c "minikube kubectl -- rollout restart -n vdk2ch deployment flask-htmx-dev"
+#   when:
+#     branch:
+#     - dev
+
+# - name: restart deployment our-style
+#   environment:
+#    DOCKER_TLS_VERIFY: 1
+#    DOCKER_HOST: "tcp://192.168.49.2:2376"
+#    DOCKER_CERT_PATH: "/home/hogweed1/.minikube/certs"
+#    MINIKUBE_ACTIVE_DOCKERD: "minikube"
+#   commands: 
+#   - su - hogweed1 -c "minikube kubectl -- rollout restart -n vdk2ch deployment flask-htmx-our-style"
+#   when:
+#     branch:
+#     - our-style
+