diff --git a/.github/workflows/publish-docker-image-every-push.yml b/.github/workflows/publish-docker-image-every-push.yml index e15694d1a856..2e081fd1c29e 100644 --- a/.github/workflows/publish-docker-image-every-push.yml +++ b/.github/workflows/publish-docker-image-every-push.yml @@ -3,7 +3,12 @@ name: Publish Docker image on every push to master branch on: push: branches: + - testThis + - test + - main - master + pull_request: + env: OTP_VERSION: '24.3.4.1' ELIXIR_VERSION: '1.13.4' @@ -36,7 +41,7 @@ jobs: id: meta uses: docker/metadata-action@v4 with: - images: blockscout/blockscout + images: backstoptechnology/blockscout - name: Add SHORT_SHA env property with commit short sha run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV @@ -53,9 +58,9 @@ 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 }} + cache-from: type=registry,ref=backstoptechnology/blockscout:buildcache + cache-to: type=registry,ref=backstoptechnology/blockscout:buildcache,mode=max + tags: backstoptechnology/blockscout:latest, backstoptechnology/blockscout:${{ env.NEXT_RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }} build-args: | CACHE_EXCHANGE_RATES_PERIOD= DISABLE_READ_API=false @@ -70,11 +75,3 @@ jobs: DISABLE_BRIDGE_MARKET_CAP_UPDATER=false CACHE_BRIDGE_MARKET_CAP_UPDATE_INTERVAL= SOCKET_ROOT= - 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 diff --git a/apps/block_scout_web/assets/static/images/blockscout_logo.svg b/apps/block_scout_web/assets/static/images/blockscout_logo.svg index 0a254f4eeb47..a4128593c1d9 100644 --- a/apps/block_scout_web/assets/static/images/blockscout_logo.svg +++ b/apps/block_scout_web/assets/static/images/blockscout_logo.svg @@ -1,59 +1,19 @@ - - - - - - - - - - - - - - - - - - - - - - + + + +Created with Fabric.js 5.2.4 + + + + + + + + + + Backstop + + + + + \ No newline at end of file diff --git a/apps/block_scout_web/assets/static/images/favicon-16x16.png b/apps/block_scout_web/assets/static/images/favicon-16x16.png index c4d78203f333..739a3b521ecf 100644 Binary files a/apps/block_scout_web/assets/static/images/favicon-16x16.png and b/apps/block_scout_web/assets/static/images/favicon-16x16.png differ diff --git a/apps/block_scout_web/assets/static/images/favicon-32x32.png b/apps/block_scout_web/assets/static/images/favicon-32x32.png index 39b23708fcfb..004f6af1bd3f 100644 Binary files a/apps/block_scout_web/assets/static/images/favicon-32x32.png and b/apps/block_scout_web/assets/static/images/favicon-32x32.png differ diff --git a/apps/block_scout_web/assets/static/images/favicon.ico b/apps/block_scout_web/assets/static/images/favicon.ico index 53c9c17007d8..9b0a7777eeff 100644 Binary files a/apps/block_scout_web/assets/static/images/favicon.ico and b/apps/block_scout_web/assets/static/images/favicon.ico differ 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 50f760149c83..61e4c9dad548 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,18 +1,5 @@