From 4c3394e032a395fe674daaaec5452130bf118487 Mon Sep 17 00:00:00 2001 From: Damian Ramirez Date: Sat, 15 Nov 2025 13:01:16 -0300 Subject: [PATCH 1/7] test docker --- .github/workflows/publish-backend-ethrex.yml | 59 ++++++++++++++++++++ docker-compose/docker-compose.yml | 13 ++--- docker-compose/envs/common-blockscout.env | 2 +- docker-compose/services/backend.yml | 7 ++- docker-compose/services/frontend.yml | 6 +- 5 files changed, 73 insertions(+), 14 deletions(-) create mode 100644 .github/workflows/publish-backend-ethrex.yml diff --git a/.github/workflows/publish-backend-ethrex.yml b/.github/workflows/publish-backend-ethrex.yml new file mode 100644 index 000000000000..2edde94fd3c4 --- /dev/null +++ b/.github/workflows/publish-backend-ethrex.yml @@ -0,0 +1,59 @@ +name: Publish Backend Docker image for Ethrex + +on: + workflow_dispatch: + push: + branches: + - ethrex-explorer + paths-ignore: + - 'CHANGELOG.md' + - '**/README.md' + +env: + RELEASE_VERSION: 9.2.2 + +permissions: + contents: read + packages: write + +jobs: + push_backend_to_registry: + name: Push Backend Docker image to GitHub Container Registry + runs-on: ubuntu-latest + + steps: + - name: Check out repo + uses: actions/checkout@v4 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to GHCR + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Add SHORT_SHA env property with commit short sha + run: echo "SHORT_SHA=${GITHUB_SHA::8}" >> $GITHUB_ENV + + - name: Build and push Backend Docker image + uses: docker/build-push-action@v6 + with: + context: . + file: ./docker/Dockerfile + push: true + cache-from: type=registry,ref=ghcr.io/lambdaclass/backend-private:buildcache + cache-to: type=registry,ref=ghcr.io/lambdaclass/backend-private:buildcache,mode=max + tags: | + ghcr.io/lambdaclass/backend-private:ethrex + ghcr.io/lambdaclass/backend-private:ethrex-${{ env.SHORT_SHA }} + platforms: | + linux/amd64 + build-args: | + BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}.ethrex.${{ env.SHORT_SHA }} + RELEASE_VERSION=${{ env.RELEASE_VERSION }} diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index b27e124262d2..b721a690cac1 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -20,17 +20,15 @@ services: service: db backend: + image: ghcr.io/lambdaclass/blockscout-staging:9.2.2.commit. + platform: linux/amd64 + pull_policy: always depends_on: - db - redis-db extends: file: ./services/backend.yml service: backend - build: - context: .. - dockerfile: ./docker/Dockerfile - args: - RELEASE_VERSION: 9.2.2 links: - db:database environment: @@ -49,8 +47,9 @@ services: service: sig-provider frontend: - image: blockscout/frontend - pull_policy: missing + image: ghcr.io/lambdaclass/frontend-private:test + platform: linux/amd64 + pull_policy: always depends_on: - backend extends: diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env index f5fdf86d3bf4..556d7fb11d86 100644 --- a/docker-compose/envs/common-blockscout.env +++ b/docker-compose/envs/common-blockscout.env @@ -1,6 +1,6 @@ ETHEREUM_JSONRPC_VARIANT=geth ETHEREUM_JSONRPC_HTTP_URL=http://host.docker.internal:1729/ -DISABLE_FILE_LOGGING=false +DISABLE_FILE_LOGGING=true DATABASE_URL=postgresql://blockscout:ceWb1MeLBEeOIfk65gU8EjF8@db:5432/blockscout # DATABASE_EVENT_POOL_SIZE diff --git a/docker-compose/services/backend.yml b/docker-compose/services/backend.yml index f63c04e81794..75f7ba8309ab 100644 --- a/docker-compose/services/backend.yml +++ b/docker-compose/services/backend.yml @@ -2,9 +2,10 @@ version: '3.9' services: backend: - # image: ghcr.io/blockscout/${DOCKER_REPO:-blockscout}:${DOCKER_TAG:-latest} - # pull_policy: always - # restart: always + image: ghcr.io/lambdaclass/blockscout-staging:9.2.2.commit. + pull_policy: always + restart: always + platform: linux/amd64 stop_grace_period: 5m container_name: 'backend' command: sh -c "bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\" && bin/blockscout start" diff --git a/docker-compose/services/frontend.yml b/docker-compose/services/frontend.yml index ef5283c0794a..d42bfa0a5ee3 100644 --- a/docker-compose/services/frontend.yml +++ b/docker-compose/services/frontend.yml @@ -2,9 +2,9 @@ version: '3.9' services: frontend: - image: blockscout/frontend - # pull_policy: always - # platform: linux/amd64 + image: ghcr.io/lambdaclass/frontend-private:test + pull_policy: always + platform: linux/amd64 restart: always container_name: 'frontend' env_file: From b6c5b87a6703be3d505e13911776daa6abb462ae Mon Sep 17 00:00:00 2001 From: Damian Ramirez Date: Sat, 15 Nov 2025 13:02:53 -0300 Subject: [PATCH 2/7] change name --- .github/workflows/publish-backend-ethrex.yml | 4 ++-- docker-compose/docker-compose.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-backend-ethrex.yml b/.github/workflows/publish-backend-ethrex.yml index 2edde94fd3c4..94764339d69c 100644 --- a/.github/workflows/publish-backend-ethrex.yml +++ b/.github/workflows/publish-backend-ethrex.yml @@ -50,8 +50,8 @@ jobs: cache-from: type=registry,ref=ghcr.io/lambdaclass/backend-private:buildcache cache-to: type=registry,ref=ghcr.io/lambdaclass/backend-private:buildcache,mode=max tags: | - ghcr.io/lambdaclass/backend-private:ethrex - ghcr.io/lambdaclass/backend-private:ethrex-${{ env.SHORT_SHA }} + ghcr.io/damiramirez/backend:ethrex + ghcr.io/damiramirez/backend:ethrex-${{ env.SHORT_SHA }} platforms: | linux/amd64 build-args: | diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index b721a690cac1..e2f7ec660a76 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -20,7 +20,7 @@ services: service: db backend: - image: ghcr.io/lambdaclass/blockscout-staging:9.2.2.commit. + image: ghcr.io/damiramirez/backend:ethrex platform: linux/amd64 pull_policy: always depends_on: From faf113096ea518df15e74d07a92b2645ead57d9a Mon Sep 17 00:00:00 2001 From: Damian Ramirez Date: Sat, 15 Nov 2025 13:06:41 -0300 Subject: [PATCH 3/7] more platforms --- .github/workflows/publish-backend-ethrex.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish-backend-ethrex.yml b/.github/workflows/publish-backend-ethrex.yml index 94764339d69c..220f82961572 100644 --- a/.github/workflows/publish-backend-ethrex.yml +++ b/.github/workflows/publish-backend-ethrex.yml @@ -54,6 +54,7 @@ jobs: ghcr.io/damiramirez/backend:ethrex-${{ env.SHORT_SHA }} platforms: | linux/amd64 + linux/arm64/v8 build-args: | BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}.ethrex.${{ env.SHORT_SHA }} RELEASE_VERSION=${{ env.RELEASE_VERSION }} From 3bb58eed98e2c7c5aa5d6690cc131f03988c5a21 Mon Sep 17 00:00:00 2001 From: Damian Ramirez Date: Sat, 15 Nov 2025 13:39:22 -0300 Subject: [PATCH 4/7] only trigger --- .github/workflows/publish-backend-ethrex.yml | 10 +--------- docker-compose/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/publish-backend-ethrex.yml b/.github/workflows/publish-backend-ethrex.yml index 220f82961572..deb8b793f201 100644 --- a/.github/workflows/publish-backend-ethrex.yml +++ b/.github/workflows/publish-backend-ethrex.yml @@ -2,12 +2,6 @@ name: Publish Backend Docker image for Ethrex on: workflow_dispatch: - push: - branches: - - ethrex-explorer - paths-ignore: - - 'CHANGELOG.md' - - '**/README.md' env: RELEASE_VERSION: 9.2.2 @@ -52,9 +46,7 @@ jobs: tags: | ghcr.io/damiramirez/backend:ethrex ghcr.io/damiramirez/backend:ethrex-${{ env.SHORT_SHA }} - platforms: | - linux/amd64 - linux/arm64/v8 + platforms: linux/arm64/v8 build-args: | BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}.ethrex.${{ env.SHORT_SHA }} RELEASE_VERSION=${{ env.RELEASE_VERSION }} diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index e2f7ec660a76..2734f2579688 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -21,7 +21,7 @@ services: backend: image: ghcr.io/damiramirez/backend:ethrex - platform: linux/amd64 + platform: linux/arm64 pull_policy: always depends_on: - db From f0353b6b0eabeefc2be10d4a22edd5af480e3b40 Mon Sep 17 00:00:00 2001 From: Damian Ramirez Date: Sat, 15 Nov 2025 13:58:16 -0300 Subject: [PATCH 5/7] use correct backend image --- .github/workflows/publish-backend-ethrex.yml | 8 ++++---- docker-compose/docker-compose.yml | 2 +- docker-compose/services/stats.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish-backend-ethrex.yml b/.github/workflows/publish-backend-ethrex.yml index deb8b793f201..85056de43340 100644 --- a/.github/workflows/publish-backend-ethrex.yml +++ b/.github/workflows/publish-backend-ethrex.yml @@ -41,11 +41,11 @@ jobs: context: . file: ./docker/Dockerfile push: true - cache-from: type=registry,ref=ghcr.io/lambdaclass/backend-private:buildcache - cache-to: type=registry,ref=ghcr.io/lambdaclass/backend-private:buildcache,mode=max + cache-from: type=registry,ref=ghcr.io/lambdaclass/blockscout-private:buildcache + cache-to: type=registry,ref=ghcr.io/lambdaclass/blockscout-private:buildcache,mode=max tags: | - ghcr.io/damiramirez/backend:ethrex - ghcr.io/damiramirez/backend:ethrex-${{ env.SHORT_SHA }} + ghcr.io/lambdaclass/blockscout-private:9.2.2.commit.763c41da + ghcr.io/lambdaclass/blockscout-private:9.2.2.commit.763c41da-${{ env.SHORT_SHA }} platforms: linux/arm64/v8 build-args: | BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}.ethrex.${{ env.SHORT_SHA }} diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 2734f2579688..ba2d999b5d11 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -20,7 +20,7 @@ services: service: db backend: - image: ghcr.io/damiramirez/backend:ethrex + image: ghcr.io/lambdaclass/blockscout-private:9.2.2.commit.763c41da platform: linux/arm64 pull_policy: always depends_on: diff --git a/docker-compose/services/stats.yml b/docker-compose/services/stats.yml index 9e32cfecbd4c..bc787b65eece 100644 --- a/docker-compose/services/stats.yml +++ b/docker-compose/services/stats.yml @@ -49,7 +49,7 @@ services: - STATS__BLOCKSCOUT_DB_URL=${STATS__BLOCKSCOUT_DB_URL:-postgresql://blockscout:ceWb1MeLBEeOIfk65gU8EjF8@db:5432/blockscout} - STATS__CREATE_DATABASE=${STATS__CREATE_DATABASE:-true} - STATS__RUN_MIGRATIONS=${STATS__RUN_MIGRATIONS:-true} - - STATS__BLOCKSCOUT_API_URL=${STATS__BLOCKSCOUT_API_URL:-http://localhost:8082} + - STATS__BLOCKSCOUT_API_URL=${STATS__BLOCKSCOUT_API_URL:-http://host.docker.internal:8082} - STATS__SERVER__HTTP__CORS__ENABLED=${STATS__SERVER__HTTP__CORS__ENABLED:-false} - STATS__SERVER__HTTP__CORS__ALLOWED_ORIGIN=${STATS__SERVER__HTTP__CORS__ALLOWED_ORIGIN} - STATS__CONDITIONAL_START__USER_OPS_PAST_INDEXING_FINISHED__ENABLED=${STATS__CONDITIONAL_START__USER_OPS_PAST_INDEXING_FINISHED__ENABLED:-false} From 7d410458322dd64619fb499698c33ee93bbc2639 Mon Sep 17 00:00:00 2001 From: Damian Ramirez Date: Sat, 15 Nov 2025 14:00:30 -0300 Subject: [PATCH 6/7] reduce diff --- docker-compose/envs/common-blockscout.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env index 556d7fb11d86..f5fdf86d3bf4 100644 --- a/docker-compose/envs/common-blockscout.env +++ b/docker-compose/envs/common-blockscout.env @@ -1,6 +1,6 @@ ETHEREUM_JSONRPC_VARIANT=geth ETHEREUM_JSONRPC_HTTP_URL=http://host.docker.internal:1729/ -DISABLE_FILE_LOGGING=true +DISABLE_FILE_LOGGING=false DATABASE_URL=postgresql://blockscout:ceWb1MeLBEeOIfk65gU8EjF8@db:5432/blockscout # DATABASE_EVENT_POOL_SIZE From 2968e3182e005999fc40e0773d6412fd1959b3b9 Mon Sep 17 00:00:00 2001 From: Damian Ramirez Date: Sat, 15 Nov 2025 14:03:52 -0300 Subject: [PATCH 7/7] update image in backend.yml --- .github/workflows/publish-backend-ethrex.yml | 52 -------------------- docker-compose/services/backend.yml | 2 +- 2 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 .github/workflows/publish-backend-ethrex.yml diff --git a/.github/workflows/publish-backend-ethrex.yml b/.github/workflows/publish-backend-ethrex.yml deleted file mode 100644 index 85056de43340..000000000000 --- a/.github/workflows/publish-backend-ethrex.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: Publish Backend Docker image for Ethrex - -on: - workflow_dispatch: - -env: - RELEASE_VERSION: 9.2.2 - -permissions: - contents: read - packages: write - -jobs: - push_backend_to_registry: - name: Push Backend Docker image to GitHub Container Registry - runs-on: ubuntu-latest - - steps: - - name: Check out repo - uses: actions/checkout@v4 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to GHCR - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Add SHORT_SHA env property with commit short sha - run: echo "SHORT_SHA=${GITHUB_SHA::8}" >> $GITHUB_ENV - - - name: Build and push Backend Docker image - uses: docker/build-push-action@v6 - with: - context: . - file: ./docker/Dockerfile - push: true - cache-from: type=registry,ref=ghcr.io/lambdaclass/blockscout-private:buildcache - cache-to: type=registry,ref=ghcr.io/lambdaclass/blockscout-private:buildcache,mode=max - tags: | - ghcr.io/lambdaclass/blockscout-private:9.2.2.commit.763c41da - ghcr.io/lambdaclass/blockscout-private:9.2.2.commit.763c41da-${{ env.SHORT_SHA }} - platforms: linux/arm64/v8 - build-args: | - BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}.ethrex.${{ env.SHORT_SHA }} - RELEASE_VERSION=${{ env.RELEASE_VERSION }} diff --git a/docker-compose/services/backend.yml b/docker-compose/services/backend.yml index 75f7ba8309ab..ab79c038e65f 100644 --- a/docker-compose/services/backend.yml +++ b/docker-compose/services/backend.yml @@ -2,7 +2,7 @@ version: '3.9' services: backend: - image: ghcr.io/lambdaclass/blockscout-staging:9.2.2.commit. + image: ghcr.io/lambdaclass/blockscout-private:9.2.2.commit.763c41da pull_policy: always restart: always platform: linux/amd64