Merge pull request #8 from dipdup-io/aux/next

Update to 7.0

.github/workflows/build.yml

@@ -1,28 +1,33 @@
 name: Build
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 on:
   push:
     branches:
-      - 'master'
+      - '**'
     tags:
-      - 'v*.*.*'
-  pull_request:
-    branches:
-      - 'master'
+      - '*.*.*'
 
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     env:
-      ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       DOCKER_REGISTRY: ghcr.io
       DOCKER_IMAGE_NAME: ${{ github.repository }}
+
     steps:
       - name: Check out the repo
         uses: actions/checkout@v2
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
+        with:
+          install: true
 
       - name: Log in to the registry
         uses: docker/login-action@v1
@@ -31,19 +36,25 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Indexer image tags & labels
+      - name: Set up metadata
         id: meta
         uses: docker/metadata-action@v3
         with:
           images: ${{ env.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE_NAME }}
+          flavor: |
+            latest=false
+          tags: |
+            type=ref,event=branch
+            type=ref,event=tag
 
-      - name: Indexer image build & push
-        uses: docker/build-push-action@v2
+      - name: Publish nightly image
+        uses: docker/build-push-action@v3
         with:
           context: tezos_domains
           file: tezos_domains/deploy/Dockerfile
+          platforms: linux/amd64,linux/arm64
           push: true
           cache-from: type=gha
           cache-to: type=gha,mode=max
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}

tezos_domains/configs/dipdup.compose.yaml

@@ -14,4 +14,9 @@ hasura:
 
 sentry:
   dsn: ${SENTRY_DSN:-""}
-  environment: ${SENTRY_ENVIRONMENT:-compose}
+  environment: ${SENTRY_ENVIRONMENT:-""}
+
+prometheus:
+  host: 0.0.0.0
+
+logging: ${LOGLEVEL:-INFO}

tezos_domains/configs/dipdup.sqlite.yaml

@@ -2,6 +2,4 @@ database:
   kind: sqlite
   path: ${SQLITE_PATH:-/tmp/tezos_domains.sqlite}
 
-sentry:
-  dsn: ${SENTRY_DSN:-""}
-  environment: ${SENTRY_ENVIRONMENT:-dev}
+logging: ${LOGLEVEL:-INFO}

tezos_domains/configs/dipdup.swarm.yaml

@@ -1,20 +1,22 @@
 database:
   kind: postgres
-  host: tezos-domains_db
+  host: ${POSTGRES_HOST:-tezos-domains_db}
   port: 5432
   user: ${POSTGRES_USER:-dipdup}
   password: ${POSTGRES_PASSWORD}
   database: ${POSTGRES_DB:-dipdup}
 
 hasura:
-  url: http://tezos-domains_hasura:8080
+  url: http://${HASURA_HOST:-tezos-domains_hasura}:8080
   admin_secret: ${HASURA_SECRET}
   allow_aggregations: false
-  camel_case: false
+  camel_case: true
 
 sentry:
   dsn: ${SENTRY_DSN:-""}
-  environment: ${SENTRY_ENVIRONMENT:-swarm}
+  environment: ${SENTRY_ENVIRONMENT:-""}
 
 prometheus:
-  host: 0.0.0.0
+  host: 0.0.0.0
+
+logging: ${LOGLEVEL:-INFO}

tezos_domains/configs/replay.yaml

@@ -9,6 +9,7 @@ replay:
   license: MIT
   name: Lev Gorodetskii
   email: [email protected]
-  postgresql_image: postgres:15
+  postgres_image: postgres:15
+  postgres_data_path: /var/lib/postgresql/data
   hasura_image: hasura/graphql-engine:v2.30.1
   line_length: 120

tezos_domains/deploy/.env.default

@@ -3,10 +3,11 @@
 #
 HASURA_HOST=hasura
 HASURA_SECRET=
+LOGLEVEL=INFO
 POSTGRES_DB=dipdup
 POSTGRES_HOST=db
 POSTGRES_PASSWORD=
 POSTGRES_USER=dipdup
 SENTRY_DSN=""
-SENTRY_ENVIRONMENT=compose
+SENTRY_ENVIRONMENT=""
 TZKT_URL=https://api.tzkt.io

tezos_domains/deploy/Dockerfile

@@ -2,7 +2,8 @@ FROM dipdup/dipdup:7
 # FROM ghcr.io/dipdup-io/dipdup:7
 # FROM ghcr.io/dipdup-io/dipdup:next
 
-RUN pip install strict_rfc3339
+COPY --chown=dipdup pyproject.toml README.md .
+RUN pip install .
 
 COPY --chown=dipdup . tezos_domains
 WORKDIR tezos_domains

tezos_domains/deploy/compose.sqlite.yaml

@@ -1,3 +1,4 @@
+version: "3.8"
 name: tezos_domains
 
 services:

tezos_domains/deploy/compose.swarm.yaml

@@ -1,3 +1,4 @@
+version: "3.8"
 name: tezos_domains
 
 services:
@@ -9,7 +10,7 @@ services:
     command: ["-c", "dipdup.yaml", "-c", "configs/dipdup.swarm.yaml", "run"]
     env_file: .env
     networks:
-      - dipdup-private
+      - internal
       - prometheus-private
     deploy:
       mode: replicated
@@ -32,7 +33,7 @@ services:
     volumes:
       - db:/var/lib/postgresql/data
     env_file: .env
-    environment: 
+    environment:
       - POSTGRES_USER=dipdup
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
@@ -42,7 +43,7 @@ services:
       timeout: 5s
       retries: 5
     networks:
-      - dipdup-private
+      - internal
     deploy:
       mode: replicated
       replicas: 1
@@ -63,7 +64,7 @@ services:
       - HASURA_GRAPHQL_UNAUTHORIZED_ROLE=user
       - HASURA_GRAPHQL_STRINGIFY_NUMERIC_TYPES=true
     networks:
-      - dipdup-private
+      - internal
       - traefik-public
     deploy:
       mode: replicated
@@ -84,7 +85,7 @@ volumes:
   db:
 
 networks:
-  dipdup-private:
+  internal:
   traefik-public:
     external: true
   prometheus-private:

tezos_domains/deploy/compose.yaml

@@ -1,3 +1,4 @@
+version: "3.8"
 name: tezos_domains
 
 services:

tezos_domains/deploy/sqlite.env.default

@@ -1,7 +1,6 @@
 # This env file was generated automatically by DipDup. Do not edit it!
 # Create a copy with .env extension, fill it with your values and run DipDup with `--env-file` option.
 #
-SENTRY_DSN=""
-SENTRY_ENVIRONMENT=dev
+LOGLEVEL=INFO
 SQLITE_PATH=/tmp/tezos_domains.sqlite
 TZKT_URL=https://api.tzkt.io

tezos_domains/deploy/swarm.env.default

@@ -1,10 +1,13 @@
 # This env file was generated automatically by DipDup. Do not edit it!
 # Create a copy with .env extension, fill it with your values and run DipDup with `--env-file` option.
 #
+HASURA_HOST=tezos_domains_hasura
 HASURA_SECRET=
+LOGLEVEL=INFO
 POSTGRES_DB=dipdup
+POSTGRES_HOST=tezos_domains_db
 POSTGRES_PASSWORD=
 POSTGRES_USER=dipdup
 SENTRY_DSN=""
-SENTRY_ENVIRONMENT=swarm
+SENTRY_ENVIRONMENT=""
 TZKT_URL=https://api.tzkt.io

tezos_domains/pyproject.toml

@@ -9,7 +9,7 @@ authors = [
 readme = "README.md"
 requires-python = ">=3.11,<3.12"
 dependencies = [
-    "dipdup>=7.0.0rc4",
+    "dipdup>=7,<8",
     "strict-rfc3339>=0.7",
 ]