From 73753ce071faac4671b82e288e76fed6f4b763da Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Tue, 22 Oct 2019 16:00:41 +0200
Subject: [PATCH] :sparkles: Minor improvements on devenv.

---
 backend/deps.edn                  | 2 +-
 docker/devenv/docker-compose.yaml | 4 ++--
 manage.sh                         | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend/deps.edn b/backend/deps.edn
index 441c05de0..0bf9823fc 100644
--- a/backend/deps.edn
+++ b/backend/deps.edn
@@ -21,7 +21,7 @@
         org.slf4j/slf4j-simple {:mvn/version "1.7.26"}
         com.layerware/hugsql-core {:mvn/version "0.4.9"
                                    :exclusions [org.clojure/tools.reader]}
-        ;; niwinz/migrante {:mvn/version "0.1.0"}
+        niwinz/migrante {:mvn/version "0.1.0"}
         buddy/buddy-sign {:mvn/version "3.1.0"}
         buddy/buddy-hashers {:mvn/version "1.4.0"}
 
diff --git a/docker/devenv/docker-compose.yaml b/docker/devenv/docker-compose.yaml
index 6ae219d8f..d510a8041 100644
--- a/docker/devenv/docker-compose.yaml
+++ b/docker/devenv/docker-compose.yaml
@@ -12,7 +12,7 @@ volumes:
   user_data:
 
 services:
-  uxbox:
+  devenv:
     privileged: true
     build:
       context: ./
@@ -39,7 +39,7 @@ services:
       - UXBOX_DATABASE_PASSWORD="uxbox"
 
   postgres:
-    image: postgres:12-beta4
+    image: postgres:12
     hostname: 'uxbox-devenv-postgres'
     container_name: 'uxbox-devenv-postgres'
     restart: always
diff --git a/manage.sh b/manage.sh
index 13329f497..6d31f464e 100755
--- a/manage.sh
+++ b/manage.sh
@@ -2,7 +2,7 @@
 set -e
 
 REV=`git log -n 1 --pretty=format:%h -- docker/`
-IMGNAME="devenv_uxbox"
+IMGNAME="uxbox_devenv"
 
 function remove-devenv-images {
     echo "Clean old development image $IMGNAME..."
@@ -13,7 +13,7 @@ function build-devenv {
     echo "Building development image $IMGNAME:latest with UID $EXTERNAL_UID..."
 
     local EXTERNAL_UID=${1:-$(id -u)}
-    docker-compose -f docker/devenv/docker-compose.yaml \
+    docker-compose -p uxbox -f docker/devenv/docker-compose.yaml \
         build --build-arg EXTERNAL_UID=$EXTERNAL_UID --force-rm;
 }
 
@@ -25,11 +25,11 @@ function build-devenv-if-not-exists {
 
 function start-devenv {
     build-devenv-if-not-exists $@;
-    docker-compose -f docker/devenv/docker-compose.yaml up -d;
+    docker-compose -p uxbox -f docker/devenv/docker-compose.yaml up -d;
 }
 
 function stop-devenv {
-    docker-compose -f docker/devenv/docker-compose.yaml stop -t 2;
+    docker-compose -p uxbox -f docker/devenv/docker-compose.yaml stop -t 2;
 }
 
 function run-devenv {