upd drone mst

.drone.yml

@@ -15,54 +15,93 @@ steps:
 - name: pull into the folduh
   commands:
   - 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: 
+#   - 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 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}
+- 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)" ${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)" ${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
+     - 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
  
  

README.md

@@ -212,4 +212,5 @@ stateDiagram-v2
     Grafana --> dash_join  
     dash_join --> User : дашборды
 
-```
+```
+

app.py

@@ -25,7 +25,7 @@ js.build()
 
 docker_short_id = socket.gethostname()
  
-arango_client = ArangoClient(hosts='https://arango.vdk2ch.ru') 
+arango_client = ArangoClient(hosts='https://arango.guaranteedstruggle.host') 
 db = arango_client.db('board1', username='root', password='stolendick527')
  
 # предполагается что меняться список будет весьма редко, поэтому подхватываем при лишь при перезапуске

templates/main-page.html

@@ -8,12 +8,10 @@
         <div class="col s4 center">
             <div class="card">
                 <div class="card-image">
-                    <img class="img-responsive" src="https://static.vdk2ch.ru/test-public/sin.jpg" height="400px" width="320px"> 
+                    <img class="img-responsive" src="https://static.guaranteedstruggle.host/test-public/sin.jpg" height="400px" width="320px"> 
                 </div>
                 <div class="card-content">
-                <p>
+                <p>  Dobro pozhalovat. AGAIN. </p>
-                    Dobro pozhalovat. AGAIN.
-                </p>
                 </div> 
             </div>
         </div>