From accddcf28037668dc3190652630f6d67eebaef89 Mon Sep 17 00:00:00 2001 From: Viktor Baranov Date: Sun, 7 Aug 2022 22:12:41 +0300 Subject: [PATCH] Update Postgres version in Docker: 13 -> 14 --- CHANGELOG.md | 1 + docker-compose/docker-compose-no-build-ganache.yml | 3 ++- docker-compose/docker-compose-no-build-geth.yml | 3 ++- docker-compose/docker-compose-no-build-hardhat-network.yml | 3 ++- docker-compose/docker-compose-no-build-no-db-container.yml | 1 + .../docker-compose-no-build-open-ethereum-nethermind.yml | 3 ++- docker-compose/docker-compose.yml | 2 +- docker/Makefile | 2 +- 8 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7142c61b92..c90d1d5569 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - [#5786](https://github.com/blockscout/blockscout/pull/5786) - Replace `current_path` with `Controller.current_full_path` in two controllers ### Chore +- [#5806](https://github.com/blockscout/blockscout/pull/5806) - Update target Postgres version in Docker: 13 -> 14 ## 4.1.7-beta diff --git a/docker-compose/docker-compose-no-build-ganache.yml b/docker-compose/docker-compose-no-build-ganache.yml index 7a5b48527c..eadaa75d84 100644 --- a/docker-compose/docker-compose-no-build-ganache.yml +++ b/docker-compose/docker-compose-no-build-ganache.yml @@ -2,7 +2,7 @@ version: '3.8' services: db: - image: postgres:13.6 + image: postgres:14 restart: always container_name: 'postgres' environment: @@ -32,6 +32,7 @@ services: INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: 'true' DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false ECTO_USE_SSL: 'false' + SECRET_KEY_BASE: '56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN' ports: - 4000:4000 diff --git a/docker-compose/docker-compose-no-build-geth.yml b/docker-compose/docker-compose-no-build-geth.yml index c2177b24e9..1a78efc856 100644 --- a/docker-compose/docker-compose-no-build-geth.yml +++ b/docker-compose/docker-compose-no-build-geth.yml @@ -2,7 +2,7 @@ version: '3.8' services: db: - image: postgres:13.6 + image: postgres:14 restart: always container_name: 'postgres' environment: @@ -33,6 +33,7 @@ services: ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/ DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false ECTO_USE_SSL: 'false' + SECRET_KEY_BASE: '56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN' ports: - 4000:4000 diff --git a/docker-compose/docker-compose-no-build-hardhat-network.yml b/docker-compose/docker-compose-no-build-hardhat-network.yml index 0277437fa6..9cf66ffe2a 100644 --- a/docker-compose/docker-compose-no-build-hardhat-network.yml +++ b/docker-compose/docker-compose-no-build-hardhat-network.yml @@ -2,7 +2,7 @@ version: '3.8' services: db: - image: postgres:13.6 + image: postgres:14 restart: always container_name: 'postgres' environment: @@ -32,6 +32,7 @@ services: INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: 'true' DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false ECTO_USE_SSL: 'false' + SECRET_KEY_BASE: '56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN' ports: - 4000:4000 diff --git a/docker-compose/docker-compose-no-build-no-db-container.yml b/docker-compose/docker-compose-no-build-no-db-container.yml index e62ed11f3a..9c924dba3f 100644 --- a/docker-compose/docker-compose-no-build-no-db-container.yml +++ b/docker-compose/docker-compose-no-build-no-db-container.yml @@ -15,6 +15,7 @@ services: ETHEREUM_JSONRPC_HTTP_URL: http://host.docker.internal:8545/ DATABASE_URL: postgresql://postgres:@host.docker.internal:5432/blockscout?ssl=false ECTO_USE_SSL: 'false' + SECRET_KEY_BASE: '56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN' ports: - 4000:4000 diff --git a/docker-compose/docker-compose-no-build-open-ethereum-nethermind.yml b/docker-compose/docker-compose-no-build-open-ethereum-nethermind.yml index 83d08eadad..02f9124445 100644 --- a/docker-compose/docker-compose-no-build-open-ethereum-nethermind.yml +++ b/docker-compose/docker-compose-no-build-open-ethereum-nethermind.yml @@ -2,7 +2,7 @@ version: '3.8' services: db: - image: postgres:13.6 + image: postgres:14 restart: always container_name: 'postgres' environment: @@ -33,6 +33,7 @@ services: ETHEREUM_JSONRPC_TRACE_URL: http://host.docker.internal:8545/ DATABASE_URL: postgresql://postgres:@host.docker.internal:7432/blockscout?ssl=false ECTO_USE_SSL: 'false' + SECRET_KEY_BASE: '56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN' ports: - 4000:4000 diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index b34a0e84d4..f14350ff65 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.8' services: db: - image: postgres:13.6 + image: postgres:14 restart: always container_name: 'postgres' environment: diff --git a/docker/Makefile b/docker/Makefile index e235211ca3..1f09731f81 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -4,7 +4,7 @@ DOCKER_REPO := blockscout APP_NAME := blockscout BS_CONTAINER_IMAGE := $(DOCKER_REPO)/$(APP_NAME) BS_CONTAINER_NAME := blockscout -PG_CONTAINER_IMAGE := postgres:13.6 +PG_CONTAINER_IMAGE := postgres:14 PG_CONTAINER_NAME := db THIS_FILE = $(lastword $(MAKEFILE_LIST)) TAG := $(RELEASE_VERSION)-prerelease-$(shell git log -1 --pretty=format:"%h")