0.0.440 docker-compose

docker-prod/deep/docker-compose.yml → docker-compose.yml

@@ -12,19 +12,19 @@ services:
     volumes:
     - db-data:/var/lib/postgresql/data
     environment:
-      - 'POSTGRES_USER=postgres'
-      - 'POSTGRES_PASSWORD=postgrespassword'
-      - 'PGGSSENCMODE=disable'
-      - 'PGSSLMODE=disable'
-      - '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:
         max-size: 10m
         max-file: "3"
   hasura:
     container_name: deep-hasura
-    image: hasura/graphql-engine:v2.3.1
+    image: hasura/graphql-engine:v2.43.0
     networks:
       - network
     ports:
@@ -36,40 +36,38 @@ services:
     - "postgres"
     restart: always
     environment:
-      - '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_JWT_SECRET={"type":"HS256","key":"3EK6FD+o0+c7tzBNVfjpMkNDi2yARAAKzQlk8O2IKoxQu4nF7EdAh8s3TwpHwrdWT6R"}'
-      - 'HASURA_GRAPHQL_ENABLE_REMOTE_SCHEMA_PERMISSIONS=true'
-      - 'HASURA_GRAPHQL_UNAUTHORIZED_ROLE=link'
+      - '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:
         max-size: 10m
         max-file: "3"
   storage:
     container_name: deep-hasura-storage
-    image: nhost/hasura-storage:0.2.3
+    image: nhost/hasura-storage:0.6.1
+    networks:
+      - network
     depends_on:
       - hasura
-    restart: unless-stopped
+    restart: always
     ports:
-      - '8000:8000'
+      - "${DEEP_HASURA_STORAGE_PORT}:8000"
+    extra_hosts: ['host.docker.internal:host-gateway']
     environment:
-      - 'DEBUG=true'
-      - 'HASURA_METADATA=1'
-      - 'HASURA_ENDPOINT=http://host.docker.internal:8080/v1'
-      - 'HASURA_GRAPHQL_ADMIN_SECRET=myadminsecretkey'
-      - '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:postgrespassword@host.docker.internal:5432/postgres?sslmode=disable'
+      - 'PORT=8000'
+      - 'DATABASE_URL=${DEEP_HASURA_STORAGE_POSTGRES_MIGRATIONS_SOURCE}'
+      - 'GRAPHQL_ENGINE_BASE_URL=${DEEP_HASURA_STORAGE_HASURA_ENDPOINT}'
+      - 'GRAPHQL_ENDPOINT=${DEEP_HASURA_STORAGE_HASURA_ENDPOINT}'
+      - 'HASURA_GRAPHQL_ADMIN_SECRET=${DEEP_HASURA_STORAGE_HASURA_GRAPHQL_ADMIN_SECRET}'
+      - 'JWT_SECRET=${DEEP_HASURA_GRAPHQL_JWT_SECRET}'
     command: serve
     logging:
       driver: "json-file"
@@ -79,40 +77,25 @@ services:
   minio:
     container_name: deep-minio
     image: minio/minio:RELEASE.2023-09-30T07-02-29Z
+    networks:
+      - network
     restart: always
     volumes:
       - 'minio-data:/export'
       - 'minio-config:/root/.minio'
     ports:
-      - '9000:9000'
-      - '32765:32765'
+      - "${DEEP_MINIO_PORT}:9000"
+      - "${DEEP_MINIO_CONSOLE_PORT}:32765"
     environment:
-      - 'MINIO_ROOT_USER=minioaccesskey'
-      - 'MINIO_ROOT_PASSWORD=miniosecretkey'
+      - '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:
       driver: "json-file"
       options:
         max-size: 10m
         max-file: "3"
-  case:
-    container_name: deep-case
-    image: deepf/deepcase:main
-    networks:
-      - network
-    ports:
-    - "3007:3007"
-    restart: always
-    pull_policy: always
-    volumes:
-    - /var/run/docker.sock:/var/run/docker.sock
-    extra_hosts: ['host.docker.internal:host-gateway']
-    logging:
-      driver: "json-file"
-      options:
-        max-size: 10m
-        max-file: "3"
   links:
     container_name: deep-links
     image: deepf/deeplinks:main
@@ -126,10 +109,10 @@ services:
     - /var/run/docker.sock:/var/run/docker.sock
     extra_hosts: ['host.docker.internal:host-gateway']
     environment:
-      - 'DEEPLINKS_HASURA_PATH=deep-hasura:8080'
-      - 'DEEPLINKS_HASURA_SSL=0'
-      - 'DEEPLINKS_HASURA_SECRET=myadminsecretkey'
-      - 'JWT_SECRET={"type":"HS256","key":"3EK6FD+o0+c7tzBNVfjpMkNDi2yARAAKzQlk8O2IKoxQu4nF7EdAh8s3TwpHwrdWT6R"}'
+      - 'DEEPLINKS_HASURA_PATH=${DEEPLINKS_HASURA_PATH}'
+      - 'DEEPLINKS_HASURA_SSL=${DEEPLINKS_HASURA_SSL}'
+      - 'DEEPLINKS_HASURA_SECRET=${DEEPLINKS_HASURA_SECRET}'
+      - 'JWT_SECRET=${DEEP_HASURA_GRAPHQL_JWT_SECRET}'
     logging:
       driver: "json-file"
       options:
@@ -145,4 +128,5 @@ volumes:
 networks:
   network:
     name: deep-network
-    driver: bridge
+    driver: bridge
+    external: true

local/actions/docker-compose.yml

@@ -145,4 +145,5 @@ volumes:
 networks:
   network:
     name: deep-network
-    driver: bridge
+    driver: bridge
+    external: true

local/deepcase/docker-compose.yml

@@ -33,3 +33,4 @@ networks:
   network:
     name: deep-network
     driver: bridge
+    external: true

local/docker-compose.yml

@@ -44,3 +44,4 @@ networks:
   network:
     name: deep-network
     driver: bridge
+    external: true

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deep-foundation/deeplinks",
-  "version": "0.0.439",
+  "version": "0.0.440",
   "license": "Unlicense",
   "type": "module",
   "scripts": {

docker-prod/deep/unix-start.sh → unix-start.sh

@@ -1,4 +1,4 @@
-curl https://raw.githubusercontent.com/deep-foundation/deeplinks/main/docker-prod/deep/docker-compose.yml > ./docker-compose.yml
+curl https://raw.githubusercontent.com/deep-foundation/deeplinks/main/docker-compose.yml > ./docker-compose.yml
 echo 'Clean and starting containers'
 docker compose -p deep down -v --remove-orphans
 docker compose pull

docker-prod/deep/windows-start.ps1 → windows-start.ps1

@@ -1,5 +1,5 @@
-wget -Uri "https://raw.githubusercontent.com/deep-foundation/deeplinks/main/docker-prod/deep/docker-compose.yml" -OutFile ".\docker-compose.yml"
-wget -Uri "https://raw.githubusercontent.com/deep-foundation/deeplinks/main/docker-prod/deep/open-deep.html" -OutFile ".\open-deep.html"
+wget -Uri "https://raw.githubusercontent.com/deep-foundation/deeplinks/main/docker-compose.yml" -OutFile ".\docker-compose.yml"
+wget -Uri "https://raw.githubusercontent.com/deep-foundation/deeplinks/main/open-deep.html" -OutFile ".\open-deep.html"
 docker compose -p deep down -v --remove-orphans; docker compose pull; docker compose -p deep up -d
 sleep 5
 echo 'Migrating data'