Просмотр исходного кода

Add SaveGroup and improve watch script

Andrea Fazzi 5 лет назад
Родитель
Сommit
21ced7e7a5
2 измененных файлов с 19 добавлено и 3 удалено
  1. 9 0
      orm/group.go
  2. 10 3
      watch.sh

+ 9 - 0
orm/group.go

@@ -13,6 +13,8 @@ type Group struct {
 
 	Name string
 
+	Search string
+
 	TeacherIDs []uint `schema:"teacher_ids" gorm:"-"`
 
 	Teachers []*Teacher `gorm:"many2many:group_teachers"`
@@ -109,6 +111,13 @@ func UpdateGroup(args map[string]string, r *http.Request) (IDer, error) {
 	return group.(*Group), nil
 }
 
+func SaveGroup(group interface{}) (interface{}, error) {
+	if err := DB().Save(group).Error; err != nil {
+		return nil, err
+	}
+	return group, nil
+}
+
 func DeleteGroup(args map[string]string, r *http.Request) (IDer, error) {
 	return nil, nil
 }

+ 10 - 3
watch.sh

@@ -1,6 +1,13 @@
-#!/bin/sh
+#!/bin/bash
+
+diskFree=$(df -h /dev/sda1 | awk 'NR>1{print $4}')
+value="${diskFree::-1}"
+
+if (( value < 3 )); then
+    docker image prune -a -f
+fi
+
 while inotifywait -r -e modify ./; do
-  # docker image prune -a -f
-  docker-compose -f compose/karmen/docker-compose.yml down -v
+  docker-compose -f compose/karmen/docker-compose.yml down
   docker-compose -f compose/karmen/docker-compose.yml up --build -d
 done