Fixes

bitcart · Aug 26, 2024 · 0e80a5b · 0e80a5b
1 parent 7978801
commit 0e80a5b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/compose/coin-plugins.Dockerfile b/compose/coin-plugins.Dockerfile
@@ -2,7 +2,7 @@ ARG COIN
 
 FROM bitcart/bitcart-${COIN}:original
 
-COPY plugins/daemons modules
+COPY plugins/daemon modules
 COPY scripts/install-backend-plugins.sh /usr/local/bin/
 RUN bash install-backend-plugins.sh
 LABEL org.bitcart.plugins=true
diff --git a/generator/docker-components/backend.yml b/generator/docker-components/backend.yml
@@ -42,7 +42,7 @@ services:
       BITCART_BACKEND_PLUGINS_DIR: /plugins/backend
       BITCART_ADMIN_PLUGINS_DIR: /plugins/admin
       BITCART_STORE_PLUGINS_DIR: /plugins/store
-      BITCART_DAEMONS_PLUGINS_DIR: /plugins/daemons
+      BITCART_DAEMON_PLUGINS_DIR: /plugins/daemon
       BITCART_DOCKER_PLUGINS_DIR: /plugins/docker
       BITCART_HOST: ${BITCART_HOST}
       BITCART_ADMIN_HOST: ${BITCART_ADMIN_HOST}

diff --git a/generator/docker-components/worker.yml b/generator/docker-components/worker.yml
@@ -33,7 +33,7 @@ services:
       BITCART_BACKEND_PLUGINS_DIR: /plugins/backend
       BITCART_ADMIN_PLUGINS_DIR: /plugins/admin
       BITCART_STORE_PLUGINS_DIR: /plugins/store
-      BITCART_DAEMONS_PLUGINS_DIR: /plugins/daemons
+      BITCART_DAEMON_PLUGINS_DIR: /plugins/daemon
       BITCART_DOCKER_PLUGINS_DIR: /plugins/docker
       BITCART_HOST: ${BITCART_HOST}
       BITCART_ADMIN_HOST: ${BITCART_ADMIN_HOST}

diff --git a/helpers.sh b/helpers.sh
@@ -70,7 +70,7 @@ bitcart_reset_plugins() {
     export ADMIN_PLUGINS_HASH=
     export STORE_PLUGINS_HASH=
     export BACKEND_PLUGINS_HASH=
-    export DAEMONS_PLUGINS_HASH=
+    export DAEMON_PLUGINS_HASH=
     export DOCKER_PLUGINS_HASH=
 }
 
@@ -235,7 +235,7 @@ SCRIPTS_POSTFIX=$SCRIPTS_POSTFIX
 ADMIN_PLUGINS_HASH=$(get_plugins_hash admin)
 STORE_PLUGINS_HASH=$(get_plugins_hash store)
 BACKEND_PLUGINS_HASH=$(get_plugins_hash backend)
-DAEMONS_PLUGINS_HASH=$(get_plugins_hash daemons)
+DAEMON_PLUGINS_HASH=$(get_plugins_hash daemon)
 DOCKER_PLUGINS_HASH=$(get_plugins_hash docker)
 EOF
     chmod +x ${BITCART_DEPLOYMENT_CONFIG}
@@ -285,7 +285,7 @@ install_plugins() {
     if [[ "$error" = false ]] && [[ " ${COMPONENTS[*]} " =~ " store " ]] && [[ "$STORE_PLUGINS_HASH" != "$(get_plugins_hash store)" ]]; then
         docker build -t bitcart/bitcart-store:stable -f compose/store-plugins.Dockerfile compose || error=true
     fi
-    if [[ "$error" = false ]] && [[ "$DAEMONS_PLUGINS_HASH" != "$(get_plugins_hash daemons)" ]]; then
+    if [[ "$error" = false ]] && [[ "$DAEMON_PLUGINS_HASH" != "$(get_plugins_hash daemon)" ]]; then
         for coin in $COIN_COMPONENTS; do
             docker build -t bitcart/bitcart-$coin:stable -f compose/coin-plugins.Dockerfile compose --build-arg COIN=$coin || error=true
         done