envs renamed to DEEP_ outside docker-compose

deep-foundation · Jul 3, 2024 · 4b0839c · 4b0839c
1 parent 4a534e6
commit 4b0839c
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 34 deletions.
diff --git a/local/docker-compose.yml b/local/docker-compose.yml
@@ -6,17 +6,17 @@ services:
     networks:
       - network
     ports:
-    - "${DEEP_POSTGRES_PORT:-5432}:5432"
+    - "${DEEP_POSTGRES_PORT}:5432"
     restart: always
     command: postgres -c max_connections=200 -c log_error_verbosity=verbose -c client_min_messages=DEBUG5 -c log_min_messages=DEBUG5 -c log_min_error_statement=DEBUG5 -c log_duration=true
     volumes:
     - db-data:/var/lib/postgresql/data
     environment:
-      - 'POSTGRES_USER=${DEEP_POSTGRES_USER:-${POSTGRES_USER:-postgres}}'
-      - 'POSTGRES_PASSWORD=${DEEP_POSTGRES_PASSWORD:-${POSTGRES_PASSWORD:-postgrespassword}}'
-      - 'PGGSSENCMODE=${DEEP_POSTGRES_GSS_ENCODING_MODE:-${PGGSSENCMODE:-disable}}'
-      - 'PGSSLMODE=${DEEP_POSTGRES_SSL_MODE:-${PGSSLMODE:-disable}}'
-      - 'PGREQUIRESSL=${DEEP_POSTGRES_REQUIRE_SSL:-${PGREQUIRESSL:-0}}'
+      - 'POSTGRES_USER=${DEEP_POSTGRES_USER}'
+      - 'POSTGRES_PASSWORD=${DEEP_POSTGRES_PASSWORD}'
+      - 'PGGSSENCMODE=${DEEP_POSTGRES_GSS_ENCODING_MODE}'
+      - 'PGSSLMODE=${DEEP_POSTGRES_SSL_MODE}'
+      - 'PGREQUIRESSL=${DEEP_POSTGRES_REQUIRE_SSL}'
     logging:
       driver: "json-file"
       options:
@@ -28,23 +28,23 @@ services:
     networks:
       - network
     ports:
-    - "${DEEP_HASURA_PORT:-8080}:8080"
+    - "${DEEP_HASURA_PORT}:8080"
     extra_hosts: ['host.docker.internal:host-gateway']
     links:
     - "postgres:postgres"
     depends_on:
     - "postgres"
     restart: always
     environment:
-      - 'HASURA_GRAPHQL_DATABASE_URL=${DEEP_HASURA_GRAPHQL_DATABASE_URL:-${HASURA_GRAPHQL_DATABASE_URL}}'
-      - 'HASURA_GRAPHQL_ENABLE_CONSOLE=${DEEP_HASURA_GRAPHQL_ENABLE_CONSOLE:-${HASURA_GRAPHQL_ENABLE_CONSOLE}}'
-      - 'HASURA_GRAPHQL_DEV_MODE=${DEEP_HASURA_GRAPHQL_DEV_MODE:-${HASURA_GRAPHQL_DEV_MODE}}'
-      - 'HASURA_GRAPHQL_LOG_LEVEL=${DEEP_HASURA_GRAPHQL_LOG_LEVEL:-${HASURA_GRAPHQL_LOG_LEVEL}}'
-      - 'HASURA_GRAPHQL_ENABLED_LOG_TYPES=${DEEP_HASURA_GRAPHQL_ENABLED_LOG_TYPES:-${HASURA_GRAPHQL_ENABLED_LOG_TYPES}}'
-      - 'HASURA_GRAPHQL_ADMIN_SECRET=${DEEP_HASURA_GRAPHQL_ADMIN_SECRET:-${HASURA_GRAPHQL_ADMIN_SECRET}}'
-      - 'HASURA_GRAPHQL_JWT_SECRET=${DEEP_HASURA_GRAPHQL_JWT_SECRET:-${JWT_SECRET}}'
-      - 'HASURA_GRAPHQL_ENABLE_REMOTE_SCHEMA_PERMISSIONS=${DEEP_HASURA_GRAPHQL_ENABLE_REMOTE_SCHEMA_PERMISSIONS:-${HASURA_GRAPHQL_ENABLE_REMOTE_SCHEMA_PERMISSIONS}}'
-      - 'HASURA_GRAPHQL_UNAUTHORIZED_ROLE=${DEEP_HASURA_GRAPHQL_UNAUTHORIZED_ROLE:-${HASURA_GRAPHQL_UNAUTHORIZED_ROLE}}'
+      - 'HASURA_GRAPHQL_DATABASE_URL=${DEEP_HASURA_GRAPHQL_DATABASE_URL}'
+      - 'HASURA_GRAPHQL_ENABLE_CONSOLE=${DEEP_HASURA_GRAPHQL_ENABLE_CONSOLE}'
+      - 'HASURA_GRAPHQL_DEV_MODE=${DEEP_HASURA_GRAPHQL_DEV_MODE}'
+      - 'HASURA_GRAPHQL_LOG_LEVEL=${DEEP_HASURA_GRAPHQL_LOG_LEVEL}'
+      - 'HASURA_GRAPHQL_ENABLED_LOG_TYPES=${DEEP_HASURA_GRAPHQL_ENABLED_LOG_TYPES}'
+      - 'HASURA_GRAPHQL_ADMIN_SECRET=${DEEP_HASURA_GRAPHQL_ADMIN_SECRET}'
+      - 'HASURA_GRAPHQL_JWT_SECRET=${DEEP_HASURA_GRAPHQL_JWT_SECRET}'
+      - 'HASURA_GRAPHQL_ENABLE_REMOTE_SCHEMA_PERMISSIONS=${DEEP_HASURA_GRAPHQL_ENABLE_REMOTE_SCHEMA_PERMISSIONS}'
+      - 'HASURA_GRAPHQL_UNAUTHORIZED_ROLE=${DEEP_HASURA_GRAPHQL_UNAUTHORIZED_ROLE}'
     logging:
       driver: "json-file"
       options:
@@ -57,20 +57,20 @@ services:
       - hasura
     restart: always
     ports:
-      - "${DEEP_HASURA_STORAGE_PORT:-8000}:8000"
+      - "${DEEP_HASURA_STORAGE_PORT}:8000"
     extra_hosts: ['host.docker.internal:host-gateway']
     environment:
-      - 'DEBUG=${DEEP_HASURA_STORAGE_DEBUG:-${HASURA_STORAGE_DEBUG}}'
-      - 'HASURA_METADATA=${DEEP_HASURA_STORAGE_HASURA_METADATA:-${HASURA_METADATA}}'
-      - 'HASURA_ENDPOINT=${DEEP_HASURA_STORAGE_HASURA_ENDPOINT:-${HASURA_ENDPOINT}}'
-      - 'HASURA_GRAPHQL_ADMIN_SECRET=${DEEP_HASURA_STORAGE_HASURA_GRAPHQL_ADMIN_SECRET:-${HASURA_GRAPHQL_ADMIN_SECRET}}'
-      - 'S3_ENDPOINT=${DEEP_HASURA_STORAGE_S3_ENDPOINT:-${S3_ENDPOINT}}'
-      - 'S3_ACCESS_KEY=${DEEP_HASURA_STORAGE_S3_ACCESS_KEY:-${S3_ACCESS_KEY}}'
-      - 'S3_SECRET_KEY=${DEEP_HASURA_STORAGE_S3_SECRET_KEY:-${S3_SECRET_KEY}}'
-      - 'S3_BUCKET=${DEEP_HASURA_STORAGE_S3_BUCKET:-${S3_BUCKET}}'
-      - 'S3_ROOT_FOLDER=${DEEP_HASURA_STORAGE_S3_ROOT_FOLDER:-${S3_ROOT_FOLDER}}'
-      - 'POSTGRES_MIGRATIONS=${DEEP_HASURA_STORAGE_POSTGRES_MIGRATIONS:-${POSTGRES_MIGRATIONS}}'
-      - 'POSTGRES_MIGRATIONS_SOURCE=${DEEP_HASURA_STORAGE_POSTGRES_MIGRATIONS_SOURCE:-${POSTGRES_MIGRATIONS_SOURCE}}'
+      - 'HASURA_GRAPHQL_ADMIN_SECRET=${DEEP_HASURA_STORAGE_HASURA_GRAPHQL_ADMIN_SECRET}'
+      - 'DEBUG=${DEEP_HASURA_STORAGE_DEBUG}'
+      - 'HASURA_METADATA=${DEEP_HASURA_STORAGE_HASURA_METADATA}'
+      - 'HASURA_ENDPOINT=${DEEP_HASURA_STORAGE_HASURA_ENDPOINT}'
+      - 'S3_ENDPOINT=${DEEP_HASURA_STORAGE_S3_ENDPOINT}'
+      - 'S3_ACCESS_KEY=${DEEP_HASURA_STORAGE_S3_ACCESS_KEY}'
+      - 'S3_SECRET_KEY=${DEEP_HASURA_STORAGE_S3_SECRET_KEY}'
+      - 'S3_BUCKET=${DEEP_HASURA_STORAGE_S3_BUCKET}'
+      - 'S3_ROOT_FOLDER=${DEEP_HASURA_STORAGE_S3_ROOT_FOLDER}'
+      - 'POSTGRES_MIGRATIONS=${DEEP_HASURA_STORAGE_POSTGRES_MIGRATIONS}'
+      - 'POSTGRES_MIGRATIONS_SOURCE=${DEEP_HASURA_STORAGE_POSTGRES_MIGRATIONS_SOURCE}'
     command: serve
     logging:
       driver: "json-file"
@@ -85,11 +85,11 @@ services:
       - 'minio-data:/export'
       - 'minio-config:/root/.minio'
     ports:
-      - "${DEEP_MINIO_PORT:-9000}:9000"
-      - "${DEEP_MINIO_CONSOLE_PORT:-32765}:32765"
+      - "${DEEP_MINIO_PORT}:9000"
+      - "${DEEP_MINIO_CONSOLE_PORT}:32765"
     environment:
-      - 'MINIO_ROOT_USER=${DEEP_MINIO_ROOT_USER:-${MINIO_ROOT_USER}}'
-      - 'MINIO_ROOT_PASSWORD=${DEEP_MINIO_ROOT_PASSWORD:-${MINIO_ROOT_PASSWORD}}'
+      - 'MINIO_ROOT_USER=${DEEP_MINIO_ROOT_USER}'
+      - 'MINIO_ROOT_PASSWORD=${DEEP_MINIO_ROOT_PASSWORD}'
     entrypoint: sh
     command: '-c ''mkdir -p /export/default && /opt/bin/minio server --address 0.0.0.0:9000 --console-address 0.0.0.0:32765 /export'''
     logging:

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@deep-foundation/hasura",
-  "version": "0.0.64",
+  "version": "0.0.65",
   "license": "Unlicense",
   "author": "Ivan S Glazunov <[email protected]>",
   "homepage": "https://github.com/deep-foundation/hasura",
@@ -33,7 +33,7 @@
     "package:publish": "npm run package:build && npm publish --access public && npm run package:unbuild",
     "package:release": "npm version patch && git push",
     "docker-local": "cd ./local && docker-compose -p deep up -d && cd ../",
-    "docker": "cross-env JWT_SECRET=\"{\\\"type\\\":\\\"HS256\\\",\\\"key\\\":\\\"3EK6FD+o0+c7tzBNVfjpMkNDi2yARAAKzQlk8O2IKoxQu4nF7EdAh8s3TwpHwrdWT6R\\\"}\" HASURA_GRAPHQL_DATABASE_URL=postgres://postgres:postgrespassword@postgres:5432/postgres HASURA_GRAPHQL_ENABLE_CONSOLE=true HASURA_GRAPHQL_DEV_MODE=true HASURA_GRAPHQL_LOG_LEVEL=debug HASURA_GRAPHQL_ENABLED_LOG_TYPES=\"startup, http-log, webhook-log, websocket-log, query-log\" HASURA_GRAPHQL_ADMIN_SECRET=myadminsecretkey HASURA_GRAPHQL_ENABLE_REMOTE_SCHEMA_PERMISSIONS=true HASURA_GRAPHQL_UNAUTHORIZED_ROLE=undefined POSTGRES_USER=postgres POSTGRES_PASSWORD=postgrespassword PGGSSENCMODE=disable PGSSLMODE=disable PGREQUIRESSL=0 MINIO_ROOT_USER=minioaccesskey MINIO_ROOT_PASSWORD=miniosecretkey HASURA_STORAGE_DEBUG=true HASURA_METADATA=1 HASURA_ENDPOINT=http://host.docker.internal:8080/v1 S3_ENDPOINT=http://host.docker.internal:9000 S3_ACCESS_KEY=minioaccesskey S3_SECRET_KEY=miniosecretkey S3_BUCKET=default S3_ROOT_FOLDER=default POSTGRES_MIGRATIONS=0 POSTGRES_MIGRATIONS_SOURCE=postgres://postgres:[email protected]:5432/postgres?sslmode=disable npm run docker-local"
+    "docker": "cross-env DEEP_POSTGRES_PORT=5432 DEEP_POSTGRES_USER=postgres DEEP_POSTGRES_PASSWORD=postgrespassword DEEP_POSTGRES_GSS_ENCODING_MODE=disable DEEP_POSTGRES_SSL_MODE=disable DEEP_POSTGRES_REQUIRE_SSL=0 DEEP_HASURA_PORT=8080 DEEP_HASURA_GRAPHQL_DATABASE_URL=postgres://postgres:postgrespassword@postgres:5432/postgres DEEP_HASURA_GRAPHQL_ENABLE_CONSOLE=true DEEP_HASURA_GRAPHQL_DEV_MODE=true DEEP_HASURA_GRAPHQL_LOG_LEVEL=debug DEEP_HASURA_GRAPHQL_ENABLED_LOG_TYPES=\"startup, http-log, webhook-log, websocket-log, query-log\" DEEP_HASURA_GRAPHQL_ADMIN_SECRET=myadminsecretkey DEEP_HASURA_GRAPHQL_JWT_SECRET=\"{\\\"type\\\":\\\"HS256\\\",\\\"key\\\":\\\"3EK6FD+o0+c7tzBNVfjpMkNDi2yARAAKzQlk8O2IKoxQu4nF7EdAh8s3TwpHwrdWT6R\\\"}\" DEEP_HASURA_GRAPHQL_ENABLE_REMOTE_SCHEMA_PERMISSIONS=true DEEP_HASURA_GRAPHQL_UNAUTHORIZED_ROLE=undefined DEEP_HASURA_STORAGE_PORT=8000 DEEP_HASURA_STORAGE_HASURA_GRAPHQL_ADMIN_SECRET=myadminsecretkey DEEP_HASURA_STORAGE_DEBUG=true DEEP_HASURA_STORAGE_HASURA_METADATA=1 DEEP_HASURA_STORAGE_HASURA_ENDPOINT=http://host.docker.internal:8080/v1 DEEP_HASURA_STORAGE_S3_ENDPOINT=http://host.docker.internal:9000 DEEP_HASURA_STORAGE_S3_ACCESS_KEY=minioaccesskey DEEP_HASURA_STORAGE_S3_SECRET_KEY=minioaccesskey DEEP_HASURA_STORAGE_S3_BUCKET=default DEEP_HASURA_STORAGE_S3_ROOT_FOLDER=default DEEP_HASURA_STORAGE_POSTGRES_MIGRATIONS=0 DEEP_HASURA_STORAGE_POSTGRES_MIGRATIONS_SOURCE=postgres://postgres:[email protected]:5432/postgres?sslmode=disable npm run docker-local DEEP_MINIO_PORT=9000 DEEP_MINIO_CONSOLE_PORT=32765 DEEP_MINIO_ROOT_USER=minioaccesskey DEEP_MINIO_ROOT_PASSWORD=miniosecretkey npm run docker-local"
   },
   "devDependencies": {
     "@types/debug": "^4.1.9",