From 6fef313408639128c5fa2881e57868974a10c830 Mon Sep 17 00:00:00 2001 From: Roderik van der Veer Date: Fri, 12 Aug 2022 13:51:11 +0200 Subject: [PATCH 01/18] fix: redo changes fix: search path --- .../publish-docker-image-every-push.yml | 41 ++++---- .../block_scout_web/assets/js/pages/layout.js | 2 +- .../templates/layout/_footer.html.eex | 96 +------------------ .../templates/layout/_topnav.html.eex | 16 ---- apps/explorer/config/config.exs | 2 +- docker-compose/envs/common-blockscout.env | 4 +- docker/Dockerfile | 2 +- 7 files changed, 26 insertions(+), 137 deletions(-) diff --git a/.github/workflows/publish-docker-image-every-push.yml b/.github/workflows/publish-docker-image-every-push.yml index 2f90390b24d8..350cbbffa49d 100644 --- a/.github/workflows/publish-docker-image-every-push.yml +++ b/.github/workflows/publish-docker-image-every-push.yml @@ -26,17 +26,20 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - name: Log in to Docker Hub + - name: Login to GitHub Container Registry uses: docker/login-action@v2 with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.PAT_TOKEN }} + + - run: docker context create gha${{ github.sha }} - name: Extract metadata (tags, labels) for Docker id: meta uses: docker/metadata-action@v4 with: - images: blockscout/blockscout + images: ghcr.io/settlemint/blockscout - name: Add SHORT_SHA env property with commit short sha run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV @@ -53,32 +56,28 @@ jobs: context: . file: ./docker/Dockerfile push: true - cache-from: type=registry,ref=blockscout/blockscout:buildcache - cache-to: type=registry,ref=blockscout/blockscout:buildcache,mode=max - tags: blockscout/blockscout:latest, blockscout/blockscout:${{ env.NEXT_RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }} + tags: ghcr.io/settlemint/blockscout:latest, ghcr.io/settlemint/blockscout:${{ env.NEXT_RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}, ghcr.io/settlemint/blockscout:${{ env.NEXT_RELEASE_VERSION }} build-args: | CACHE_EXCHANGE_RATES_PERIOD= DISABLE_READ_API=false - API_PATH= - NETWORK_PATH= + API_PATH=/ + NETWORK_PATH=/explorer DISABLE_WEBAPP=false DISABLE_WRITE_API=false CACHE_ENABLE_TOTAL_GAS_USAGE_COUNTER= WOBSERVER_ENABLED=false - ADMIN_PANEL_ENABLED=false + ADMIN_PANEL_ENABLED=true CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL= - DISABLE_BRIDGE_MARKET_CAP_UPDATER=false + DISABLE_BRIDGE_MARKET_CAP_UPDATER=true CACHE_BRIDGE_MARKET_CAP_UPDATE_INTERVAL= - SOCKET_ROOT= + SOCKET_ROOT=/explorer CHAIN_ID= JSON_RPC= - COIN_NAME= + COIN_NAME=Native Token + COIN=NT SUBNETWORK= - tests: - needs: push_to_registry - uses: blockscout/blockscout-ci-cd/.github/workflows/e2e_k8s.yaml@master - with: - blockscout_image: blockscout/blockscout:${{ needs.push_to_registry.outputs.release-version }}-prerelease-${{ needs.push_to_registry.outputs.short-sha }} - environment: 'test' - verification_image: 'ghcr.io/blockscout/verification:latest' - secrets: inherit + DISABLE_EXCHANGE_RATES=true + SECRET_KEY_BASE=RMgI4C1HSkxsEjdhtGMfwAHfyT6CKWXOgzCboJflfSm4jeAlic52io05KB6mqzc5 + ENABLE_TXS_STATS=true + SHOW_TXS_CHART=true + LOGO=/explorer/images/blockscout_logo.svg \ No newline at end of file diff --git a/apps/block_scout_web/assets/js/pages/layout.js b/apps/block_scout_web/assets/js/pages/layout.js index 43fb5a2178f6..e572f0f39516 100644 --- a/apps/block_scout_web/assets/js/pages/layout.js +++ b/apps/block_scout_web/assets/js/pages/layout.js @@ -11,7 +11,7 @@ $(document).click(function (event) { const search = (value) => { if (value) { - window.location.href = `/search?q=${value}` + window.location.href = `/explorer/search?q=${value}` } } diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex index 61adfcd71224..2081a98b1e2c 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex @@ -1,95 +1 @@ - + \ No newline at end of file diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex index 6c1db5ce8e6c..75d3a0f0e6c5 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex @@ -136,26 +136,10 @@ <% end %>
  • - " href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <%= render BlockScoutWeb.IconsView, "_active_icon.html" %> <%= subnetwork_title() %> - -
    - Mainnets - <%= for %{url: url, title: title} <- dropdown_head_main_nets() do %> - <%= title %> - <% end %> - Testnets - <%= for %{url: url, title: title} <- test_nets(dropdown_nets()) do %> - <%= title %> - <% end %> - Other Networks - <%= for %{url: url, title: title} <- dropdown_other_nets() do %> - <%= title %> - <% end %> -
    • diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs index cc58587a54ad..b37cdfe44b3f 100644 --- a/apps/explorer/config/config.exs +++ b/apps/explorer/config/config.exs @@ -55,7 +55,7 @@ config :explorer, Explorer.Counters.AddressTokenUsdSum, enable_consolidation: true config :explorer, Explorer.Chain.Cache.TokenExchangeRate, - enabled: true, + enabled: false, enable_consolidation: true config :explorer, Explorer.Counters.TokenHoldersCounter, diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env index 872fead91d68..16535e1b01cc 100644 --- a/docker-compose/envs/common-blockscout.env +++ b/docker-compose/envs/common-blockscout.env @@ -5,8 +5,8 @@ DATABASE_URL=postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=fal ETHEREUM_JSONRPC_TRACE_URL=http://host.docker.internal:8545/ NETWORK= SUBNETWORK=Awesome chain -LOGO=/images/blockscout_logo.svg -LOGO_FOOTER=/images/blockscout_logo.svg +LOGO=/explorer/images/blockscout_logo.svg +LOGO_FOOTER=/explorer/images/blockscout_logo.svg # ETHEREUM_JSONRPC_WS_URL= ETHEREUM_JSONRPC_TRANSPORT=http IPC_PATH= diff --git a/docker/Dockerfile b/docker/Dockerfile index fb97244d8c4b..badf3e467bf4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -47,7 +47,7 @@ ADD apps/explorer/mix.exs ./apps/explorer/ ADD apps/ethereum_jsonrpc/mix.exs ./apps/ethereum_jsonrpc/ ADD apps/indexer/mix.exs ./apps/indexer/ -RUN mix do deps.get, local.rebar --force, deps.compile +RUN mix do deps.get, local.rebar --force, deps.compile, deps.compile phoenix --force ADD . . From 147fcff24033242dfd0933bbbb92061479fe44af Mon Sep 17 00:00:00 2001 From: Roderik van der Veer Date: Tue, 16 Aug 2022 10:51:32 +0200 Subject: [PATCH 02/18] fix: layout and paths --- .github/workflows/publish-docker-image-every-push.yml | 2 +- .../lib/block_scout_web/templates/layout/_topnav.html.eex | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/publish-docker-image-every-push.yml b/.github/workflows/publish-docker-image-every-push.yml index 350cbbffa49d..4ff5e72e94cf 100644 --- a/.github/workflows/publish-docker-image-every-push.yml +++ b/.github/workflows/publish-docker-image-every-push.yml @@ -60,7 +60,7 @@ jobs: build-args: | CACHE_EXCHANGE_RATES_PERIOD= DISABLE_READ_API=false - API_PATH=/ + API_PATH=/explorer NETWORK_PATH=/explorer DISABLE_WEBAPP=false DISABLE_WRITE_API=false diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex index 75d3a0f0e6c5..fab4985530b2 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex @@ -135,12 +135,6 @@ <% end %> -
  • - - <%= render BlockScoutWeb.IconsView, "_active_icon.html" %> - - <%= subnetwork_title() %> -