postgres init file added

Trefo · Jan 16, 2018 · 06f3078 · 06f3078
1 parent 3211488
commit 06f3078
Show file tree

Hide file tree

Showing 31 changed files with 7 additions and 22 deletions.
diff --git a/agdss/settings/common.py b/agdss/settings/common.py
@@ -132,6 +132,6 @@
 # https://docs.djangoproject.com/en/1.9/howto/static-files/
 STATIC_URL = '/static/'
 STATIC_ROOT = "/app/static-root/"
-CATEGORY_TO_LABEL = 'tomato'
+CATEGORY_TO_LABEL = 'ground-gear'
 LABEL_FOLDER_NAME = 'labels-'
 
diff --git a/annotable/small-tomatoes/IMG_2565.JPG b/annotable/small-tomatoes/IMG_2565.JPG
diff --git a/annotable/small-tomatoes/IMG_2566.JPG b/annotable/small-tomatoes/IMG_2566.JPG
diff --git a/annotable/small-tomatoes/IMG_2567.JPG b/annotable/small-tomatoes/IMG_2567.JPG
diff --git a/annotable/small-tomatoes/IMG_2568.JPG b/annotable/small-tomatoes/IMG_2568.JPG
diff --git a/annotable/small-tomatoes/IMG_2569.JPG b/annotable/small-tomatoes/IMG_2569.JPG
diff --git a/annotable/small-tomatoes/IMG_2570.JPG b/annotable/small-tomatoes/IMG_2570.JPG
diff --git a/annotable/small-tomatoes/IMG_2571.JPG b/annotable/small-tomatoes/IMG_2571.JPG
diff --git a/annotable/small-tomatoes/IMG_2572.JPG b/annotable/small-tomatoes/IMG_2572.JPG
diff --git a/annotable/small-tomatoes/IMG_2573.JPG b/annotable/small-tomatoes/IMG_2573.JPG
diff --git a/annotable/small-tomatoes/IMG_2574.JPG b/annotable/small-tomatoes/IMG_2574.JPG
diff --git a/annotable/small-tomatoes/IMG_2575.JPG b/annotable/small-tomatoes/IMG_2575.JPG
diff --git a/annotable/small-tomatoes/IMG_2576.JPG b/annotable/small-tomatoes/IMG_2576.JPG
diff --git a/annotable/small-tomatoes/IMG_2577.JPG b/annotable/small-tomatoes/IMG_2577.JPG
diff --git a/annotable/small-tomatoes/IMG_2578.JPG b/annotable/small-tomatoes/IMG_2578.JPG
diff --git a/annotable/small-tomatoes/IMG_2579.JPG b/annotable/small-tomatoes/IMG_2579.JPG
diff --git a/annotable/small-tomatoes/IMG_2590.JPG b/annotable/small-tomatoes/IMG_2590.JPG
diff --git a/annotable/small-tomatoes/IMG_2591.JPG b/annotable/small-tomatoes/IMG_2591.JPG
diff --git a/annotable/small-tomatoes/IMG_2592.JPG b/annotable/small-tomatoes/IMG_2592.JPG
diff --git a/annotable/small-tomatoes/IMG_2593.JPG b/annotable/small-tomatoes/IMG_2593.JPG
diff --git a/annotable/small-tomatoes/IMG_2594.JPG b/annotable/small-tomatoes/IMG_2594.JPG
diff --git a/annotable/small-tomatoes/IMG_2595.JPG b/annotable/small-tomatoes/IMG_2595.JPG
diff --git a/annotable/small-tomatoes/IMG_2596.JPG b/annotable/small-tomatoes/IMG_2596.JPG
diff --git a/annotable/small-tomatoes/IMG_2597.JPG b/annotable/small-tomatoes/IMG_2597.JPG
diff --git a/annotable/small-tomatoes/IMG_2598.JPG b/annotable/small-tomatoes/IMG_2598.JPG
diff --git a/annotable/small-tomatoes/IMG_2599.JPG b/annotable/small-tomatoes/IMG_2599.JPG
diff --git a/annotable/small-tomatoes/addImages.sh b/annotable/small-tomatoes/addImages.sh
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
     volumes:
       - ./:/app
     working_dir: /app
-    command: bash -c "cp -r annotable/small-tomatoes/ webclient/static/ && python3 manage.py runserver 0.0.0.0:8000 --settings=agdss.settings.common"
+    command: bash -c "cp -r annotable/ground-gear/ webclient/static/ && python3 manage.py runserver 0.0.0.0:8000 --settings=agdss.settings.common"
 
 
 networks:  

diff --git a/dockerfiles/postgres/init.sql b/dockerfiles/postgres/init.sql
@@ -0,0 +1,3 @@
+CREATE DATABASE "agdss";
+CREATE USER aguser WITH PASSWORD 'aguser';
+GRANT ALL PRIVILEGES ON DATABASE "agdss" to aguser;
diff --git a/webclient/image_ops/crop_images.py b/webclient/image_ops/crop_images.py
@@ -7,8 +7,8 @@
 import random
 
 
-NUM_WINDOW_ROWS = 4
-NUM_WINDOW_COLS = 4
+NUM_WINDOW_ROWS = 1
+NUM_WINDOW_COLS = 1
 WINDOW_PADDING = 20
 NUM_LABELS_PER_WINDOW = 3
 

diff --git a/webclient/templates/webclient/label.html b/webclient/templates/webclient/label.html
@@ -206,7 +206,6 @@
             }else{
                 raster.remove();
             }
-
             //selectedImage = JSON.parse($('#imageCombo').val());
             $.ajax({
                 url: "/webclient/getNewImage",