Use proper container names

.circleci/config.yml

@@ -64,13 +64,13 @@ workflows:
       - test:
           requires:
             - lint
-      # - cansetup:
-      #     requires:
-      #       - test
+      - cansetup:
+          requires:
+            - test
       - deploy:
           context: global
-          # requires:
-          #   - cansetup
+          requires:
+            - cansetup
           filters:
             branches:
               only: master

bitcart-cli.sh

@@ -3,4 +3,4 @@
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
 . "${SCRIPT_DIR}/helpers.sh"
 load_env
-docker exec $(container_name worker_1) bitcart-cli "$@"
+docker exec $(container_name worker-1) bitcart-cli "$@"

contrib/upgrades/upgrade-to-0500.sh

@@ -3,7 +3,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
 . "${SCRIPT_DIR}/../../helpers.sh"
 load_env
 
-docker exec -i $(container_name database_1) psql -U postgres bitcart <<EOF
+docker exec -i $(container_name database-1) psql -U postgres bitcart <<EOF
 ALTER TABLE discountsxproducts RENAME CONSTRAINT discountsxproducts_discount_id_fkey TO discountsxproducts_discount_id_discounts_fkey;
 ALTER TABLE discountsxproducts RENAME CONSTRAINT discountsxproducts_product_id_fkey TO discountsxproducts_product_id_products_fkey;
 ALTER TABLE discounts RENAME CONSTRAINT discounts_user_id_fkey TO discounts_user_id_users_fkey;
@@ -25,7 +25,7 @@ ALTER TABLE tokens RENAME CONSTRAINT tokens_user_id_fkey TO tokens_user_id_users
 ALTER TABLE walletsxstores RENAME CONSTRAINT walletsxstores_wallet_id_fkey TO walletsxstores_wallet_id_wallets_fkey;
 EOF
 
-docker top $(container_name worker_1) >/dev/null 2>&1 && docker exec -i $(container_name worker_1) python3 <<EOF
+docker top $(container_name worker-1) >/dev/null 2>&1 && docker exec -i $(container_name worker-1) python3 <<EOF
 import asyncio
 
 from api import models, settings

contrib/upgrades/upgrade-to-0600.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 function convert_name() {
-    docker exec -i $(container_name worker_1) python3 <<EOF
+    docker exec -i $(container_name worker-1) python3 <<EOF
 s = "$1"
 s = s.replace("-log", "")
 parts = s.split(".")

contrib/upgrades/upgrade-to-0610.sh

@@ -3,5 +3,5 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
 . "${SCRIPT_DIR}/../../helpers.sh"
 load_env
 
-docker exec -i $(container_name database_1) sed -i 's/host all all all md5/host all all all trust/' /var/lib/postgresql/data/pg_hba.conf
+docker exec -i $(container_name database-1) sed -i 's/host all all all md5/host all all all trust/' /var/lib/postgresql/data/pg_hba.conf
 bitcart_restart

helpers.sh

@@ -145,12 +145,12 @@ create_backup_volume() {
 
 bitcart_dump_db() {
     create_backup_volume
-    docker exec $(container_name "database_1") pg_dumpall -c -U postgres >"$backup_dir/$1"
+    docker exec $(container_name "database-1") pg_dumpall -c -U postgres >"$backup_dir/$1"
 }
 
 bitcart_restore_db() {
     bitcart_start database
-    cat $1 | docker exec -i $(container_name "database_1") psql -U postgres
+    cat $1 | docker exec -i $(container_name "database-1") psql -U postgres
 }
 
 version() {