diff --git a/.github/workflows/publish-docker-image-every-push.yml b/.github/workflows/publish-docker-image-every-push.yml index d008609096..0329bb05f9 100644 --- a/.github/workflows/publish-docker-image-every-push.yml +++ b/.github/workflows/publish-docker-image-every-push.yml @@ -65,7 +65,8 @@ jobs: WOBSERVER_ENABLED=false ADMIN_PANEL_ENABLED=false CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL= - BLOCKSCOUT_VERSION=v{{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }} + BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }} + RELEASE_VERSION=${{ env.RELEASE_VERSION }} - name: Build and push Docker image for frontend uses: docker/build-push-action@v3 diff --git a/.github/workflows/publish-docker-image-release.yml b/.github/workflows/publish-docker-image-release.yml index 468214f58d..305804f2d6 100644 --- a/.github/workflows/publish-docker-image-release.yml +++ b/.github/workflows/publish-docker-image-release.yml @@ -63,6 +63,7 @@ jobs: ADMIN_PANEL_ENABLED= CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL= BLOCKSCOUT_VERSION=v{{ env.RELEASE_VERSION }}-beta + RELEASE_VERSION={{ env.RELEASE_VERSION }} merge-master-after-release: name: Merge 'master' to specific branch after release diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ea8102a3e..fc062cf2ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,7 +28,7 @@ - [#7144](https://github.com/blockscout/blockscout/pull/7144) - Update Blockscout logo - [#7136](https://github.com/blockscout/blockscout/pull/7136) - Add release link or commit hash to docker images - [#7097](https://github.com/blockscout/blockscout/pull/7097) - Force display token instance page -- [#7119](https://github.com/blockscout/blockscout/pull/7119) - Refactor runtime config +- [#7119](https://github.com/blockscout/blockscout/pull/7119), [#7149](https://github.com/blockscout/blockscout/pull/7149) - Refactor runtime config - [#7072](https://github.com/blockscout/blockscout/pull/7072) - Add a separate docker compose for geth with clique consensus - [#7056](https://github.com/blockscout/blockscout/pull/7056) - Add path_helper in interact.js - [#7040](https://github.com/blockscout/blockscout/pull/7040) - Use alias BlockScoutWeb.Cldr.Number diff --git a/docker/Dockerfile b/docker/Dockerfile index ded5bf3990..50d26c36ad 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -36,8 +36,6 @@ ARG MIXPANEL_TOKEN ARG MIXPANEL_URL ARG AMPLITUDE_API_KEY ARG AMPLITUDE_URL -ARG BLOCKSCOUT_VERSION -ENV BLOCKSCOUT_VERSION=${BLOCKSCOUT_VERSION} # Cache elixir deps ADD mix.exs mix.lock ./ @@ -73,6 +71,11 @@ RUN mkdir -p /opt/release \ ############################################################## FROM bitwalker/alpine-elixir-phoenix:1.14 +ARG RELEASE_VERSION +ENV RELEASE_VERSION=${RELEASE_VERSION} +ARG BLOCKSCOUT_VERSION +ENV BLOCKSCOUT_VERSION=${BLOCKSCOUT_VERSION} + RUN apk --no-cache --update add jq WORKDIR /app @@ -80,3 +83,5 @@ WORKDIR /app COPY --from=builder /opt/release/blockscout . COPY --from=builder /app/apps/explorer/node_modules ./node_modules COPY --from=builder /app/config/config_helper.exs ./config/config_helper.exs +COPY --from=builder /app/config/config_helper.exs /app/releases/${RELEASE_VERSION}/config_helper.exs +