inline secret export for y-provider

abra-entrypoint.sh

@@ -3,7 +3,6 @@ set -e
 
 [ -f /run/secrets/postgres_p ] && export DB_PASSWORD="$(cat /run/secrets/postgres_p)"
 [ -f /run/secrets/django_sk ] && export DJANGO_SECRET_KEY="$(cat /run/secrets/django_sk)"
-#[ -f /run/secrets/minio_rp ] && export MINIO_ROOT_PASSWORD="$(cat /run/secrets/minio_rp)"
 [ -f /run/secrets/minio_rp ] && export AWS_S3_SECRET_ACCESS_KEY="$(cat /run/secrets/minio_rp)"
 [ -f /run/secrets/minio_ru ] && export AWS_S3_ACCESS_KEY_ID="$(cat /run/secrets/minio_ru)"
 [ -f /run/secrets/django_sp ] && export DJANGO_SUPERUSER_PASSWORD="$(cat /run/secrets/django_sp)"
@@ -13,11 +12,5 @@ set -e
 
 # if not in "env" mode, then execute the original entrypoint and command
 if [ ! "$1" = "-e" ]; then
-  ORIGINAL_ENTRYPOINT="$1"
+  exec "$@"
-  shift
-  if [ -n "$ORIGINAL_ENTRYPOINT" ] && [ "$ORIGINAL_ENTRYPOINT" != "null" ]; then
-    exec "$ORIGINAL_ENTRYPOINT" "$@"
-  else
-    exec "$@"
-  fi
 fi

compose.yml

@@ -119,6 +119,7 @@ services:
       - oidc_rpcs
       - collab_ss
       - minio_rp
+      - minio_ru
       - postgres_p
       - y_api_key
 
@@ -149,20 +150,11 @@ services:
     networks:
       - backend 
     environment: *yprovider-env
+    entrypoint: >
+      sh -c "export Y_PROVIDER_API_KEY=\"$$(cat /run/secrets/y_api_key)\" && exec /usr/local/bin/entrypoint \"$$@\"" --
     command: ["yarn", "start"]
-    entrypoint: ["/abra-entrypoint.sh", "/usr/local/bin/entrypoint"]
-    configs:
-      - source: abra_entrypoint
-        target: /abra-entrypoint.sh
-        mode: 0555
     # NOTE: healthcheck - `wget` is available in the container, but `wget http://localhost:4444` gives a 403
     secrets:
-      - django_sk
-      - django_sp
-      - oidc_rpcs
-      - collab_ss
-      - minio_rp
-      - postgres_p
       - y_api_key
 
   db:
@@ -231,7 +223,7 @@ services:
     networks:
       - backend 
     command: minio server /data
-    entrypoint: ["/abra-entrypoint.sh", "/usr/bin/docker-entrypoint.sh"]
+    entrypoint: ["/usr/bin/docker-entrypoint.sh"]
     volumes:
       - minio:/data
     deploy:
@@ -254,6 +246,9 @@ services:
     networks:
       proxy:
       backend:
+    depends_on:
+      - backend
+      - app
     environment:
       - STACK_NAME
     deploy: