[tryton-commits] [Mercurial][tryton/demo][branch/default] 2 commits: Replace docker-compose by docker compose

[@ced]

Cédric Krier pushed to branch branch/default at Tryton / Demo


Commits:
3cbc03dc by Cédric Krier at 2023-04-17T09:17:46+02:00
Replace docker-compose by docker compose

docker-compose command is deprecated in version 2.
- - - - -
f36bea5e by Cédric Krier at 2023-04-17T09:22:28+02:00
Quote SERIES argument
- - - - -


2 changed files:

- docker-compose.yml
- update.sh


Changes:

=====================================
docker-compose.yml
=====================================
@@ -10,7 +10,7 @@
         build:
             context: .
             args:
-                SERIES: 6.6
+                SERIES: "6.6"
         image: tryton/tryton-demo:6.6
         env_file: 6.6.env
         environment:
@@ -50,7 +50,7 @@
         build:
             context: .
             args:
-                SERIES: 6.4
+                SERIES: "6.4"
         image: tryton/tryton-demo:6.4
         env_file: 6.4.env
         environment:
@@ -90,7 +90,7 @@
         build:
             context: .
             args:
-                SERIES: 6.0
+                SERIES: "6.0"
         image: tryton/tryton-demo:6.0
         env_file: 6.0.env
         environment:
@@ -130,7 +130,7 @@
         build:
             context: .
             args:
-                SERIES: 5.0
+                SERIES: "5.0"
         image: tryton/tryton-demo:5.0
         env_file: 5.0.env
         environment:


=====================================
update.sh
=====================================
@@ -4,9 +4,9 @@
 cd "$(dirname "$0")"
 proj="demo"
 
-docker-compose -p ${proj} down --remove-orphans
-docker-compose -p ${proj} pull --ignore-pull-failures --quiet 2>/dev/null || : 
# disable error status
-docker-compose -p ${proj} build --pull --quiet
+docker compose -p ${proj} down --remove-orphans
+docker compose -p ${proj} pull --ignore-pull-failures --quiet 2>/dev/null || : 
# disable error status
+docker compose -p ${proj} build --pull --quiet
 
 for directory in databases/?.?; do
     series=$(basename ${directory})
@@ -10,8 +10,8 @@
 
 for directory in databases/?.?; do
     series=$(basename ${directory})
-    docker-compose -p ${proj} up -d postgres-${series}
-    until docker-compose -p ${proj} exec -T --user postgres postgres-${series} 
pg_isready; do
+    docker compose -p ${proj} up -d postgres-${series}
+    until docker compose -p ${proj} exec -T --user postgres postgres-${series} 
pg_isready; do
         sleep 2
     done
     sleep 2
@@ -15,8 +15,8 @@
         sleep 2
     done
     sleep 2
-    docker-compose -p ${proj} exec -T --user postgres postgres-${series} 
dropdb --if-exists demo${series}
-    docker-compose -p ${proj} exec -T --user postgres postgres-${series} 
createdb demo${series}
-    docker-compose -p ${proj} exec -T --user postgres postgres-${series} psql 
-q demo${series} < ${directory}/database.dump >/dev/null
+    docker compose -p ${proj} exec -T --user postgres postgres-${series} 
dropdb --if-exists demo${series}
+    docker compose -p ${proj} exec -T --user postgres postgres-${series} 
createdb demo${series}
+    docker compose -p ${proj} exec -T --user postgres postgres-${series} psql 
-q demo${series} < ${directory}/database.dump >/dev/null
 done
 
@@ -21,3 +21,3 @@
 done
 
-docker-compose -p ${proj} up --remove-orphans -d
+docker compose -p ${proj} up --remove-orphans -d



View it on Heptapod: 
https://foss.heptapod.net/tryton/demo/-/compare/42f801e608ca8e43b34e1d4f08a3ed55256cdbc1...f36bea5ec84373a66ce3f805ba631e3f1b366a95

-- 
View it on Heptapod: 
https://foss.heptapod.net/tryton/demo/-/compare/42f801e608ca8e43b34e1d4f08a3ed55256cdbc1...f36bea5ec84373a66ce3f805ba631e3f1b366a95
You're receiving this email because of your account on foss.heptapod.net.